fixes for CMI and build