FIX: A few bugs

Just a few small things I found when porting the new features over to
Firefox.