Sync service fixes

Fixes #29 .