Some more minor changes to Map