Fixes for SafariDriver