Fix a couple more Firefox annoyances.