Mapping fixes.
Various fixes to SOAP operations.