Collision detection improvements.