Fix peer review comments

Refs #3120