Collision and selection fixes