A couple of changes to the cmake build system.