Collision bug fixes