More fixes to cmake build mostly for MPE