CMake build fixes