Bugfixes: correct setup for timeouts after first sync, don't crash on failed restart