CMake BuildConfigH corrections