Fixes for Firefox 22