Minor Update of CMake Modules