Collision handling fixes