Repaired sync and stub repo after refactoring