General cleanups for CMakeLists