Unborking CMake build