Fixups from TBR for PR #1289
respond to additional review