Further cmake mods