fix a few things missed in the "great cherry-pick"