Some quick changes to MapUtil