sync-engine-shared - Minor fixes