Some fixes to CMakeLists.txt files