minor sfdc fixes
merge conflict resolution