Improve port change handling
Fix sporadically failing test on IE
SauceLabs