WebDriver build fixes.