Minor CMake cleanups