Fixing Firefox issues