Fixed up map stuff