Still refining CMake build