Last couple of bugfixes for RW Salesforce before merging in upstream changes.