CMake Fixes