No bug - Backport a bunch of trivial fixes from Fennec.