Fix issues with Firefox