CMake tweaks