Slight cleanups for Firefox.

Some stuff is still messed up. Maybe messages are skipped? Not sure.