Fix a couple of mistake with maps and world