Tying up loose ends for the Mac sync.