Fixes #3 #4

Fixes interop with latest firefox and the android client