Housekeeping

More housekeeping for CMake.