CMake and style fixes.