ENH: Fixes for Cmake, no required