fix items missed in cherry-pick

Looks like a couple things got missed