Minor improvements to Map (see #15)