More Collision fixes