Firefox fixes

* Fixes #9