Fix peer review comments

Refs #2870