Collision fixes