Some updates on sync process (closes #4451, closes #4450, closes #4453)