fix some side effects of yesterday's changes...