Fixed some more issues found during testing: SOAP-2096