Made some small fixes / cleanup changes to our CMake file.