Some needed fixes for Facebook flow with custom added scope