Fixed issues in Firefox