Minor CMake build fixes