Tweaks to CMakeLists.txt