Fixing some misbehaving by Firefox