Collision fix ups.