Minor fixes to CMake modules.