Fix service restarts
Merge branch 'sync-service'