Small updates to get maps working