Crazy amount of map fixes.