Fixes to SMACK negotiation.