Fixes for crossbrowser tests