various fixes (hopefully) surrounding the sync issues