Fix peer review feedback

Refs #2417