Some changes
Add firefox workaround