Fix some CMake checks