Collision handling improvements