Fixing issues with Firefox