Fixing map and collisions.