sync-engine-shared - Various minor fixes