Fix some imports in salesforce sync