Fix misc. warnings

Refs #1777.
Merge pull request #3445 from jwpeterson/fix_warnings

Fix misc. warnings
Merge commit '489a461e0952edf622f107a21687179c9e76e74d'