fixes for native FxA