Fix dependencies with SyncEngine etc