Firefox fixes

* Fixes #10