Two Tribes changes/fixes to GWEN