Fixes for FxA method