Fix a couple CMake issues