Changes to CMake and others