sync-engine-shared - Various fixes
sync-engine-shared I assume this was a typo? Please undo if it's not, and we should have a test for this?