Bug/syncing

Fixes a few critical issues that were causing fatal errors on single site.

#reviewmerge @tlovett1 or @mattonomics