Fixups for SGS negotiation special-case