CMake cleanup/fixes