Several small fixes to SLM and the privacy negotiation test