Fix peer review feedback

Refs #3046