-- Fixed a few bugs that afflicted the sync.