Added missing changes from CMake system.