Minor fixes to CMake files