Fix map location issues (hopefully)