HybridAuth fixes

Small fixes for the recent integration.