Improve port change handling
SAUCELABS