Few fixes to keep clang happy

Refs #10368