Fixing some Firefox issues