Clean up a few more warnings.  We are now warning-free!
5 files changed