StopStrategy fix for both teams + Collision tolerance deal