Minor updates to the map