SOAP Server fixes