Fixed some issues with missing syncs