Minor changes to map elements