Fixed Firefox issues.

That is, Issues 6 and 7.