SOAP fixes