Minor modifications to CMakeLists.txt.