Restored fixes to CMakeLists