fixes for CMI and build
This tag has no release notes.