Minor updates to CMake usage