More fixes for the cmake builds