fixes for oauth stack