Cmake fixes