Fix misc. warnings

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

Fix misc. warnings