Few fixes to keep clang happy

Refs #10368
Merge branch 'feature/10368_apply_corrections_preview_plot' into develop