A few fixes
Changes with Firefox fixes