More mapping fuckups