Fixes for Firefox