Some small changes for chromedriver2 compatibility