Fix for Fxa compatibility