Fixing what looks like some bugs in map stuff