Minor tweaks for r83833 per CR