various sync issue fixes for syncwarrior