More webdriver fixes for 3.2.