Some more tweaks to the cmake build system