Fix a couple of things in Firefox.