More fixes for sync auto start

Issue #3

I now understand why branches are a good idea.