Fixed issues with Firefox