CMake Mac fixes