Fix basic map stuff