More CMake Fixes

- Just shooting in the dark here.