sync-engine - Various fixes