More changes to CMake in the hopes of fixing things betterer