sync-engine-shared - Simplify and fix compile