Added some fixes for Firefox