Various updates
Simplified GSS context token exchange