Updates to CMake config