Add small CMake adjustments