Minor changes to Maps helper methods