Minor updates to map code