cmMakefile: FIx up some missed hashmap conversions