Fix followups to PR2797