Collision and map bugs