More fixes for cmake