Misc CMake changes.