Minor changes to map