Minor changes to map configuration