Sync support

Fixes made as a result of implementing Crm Synchronisation.