Add missing changes and CMake from last change