fix some recently introduced warnings
Merge pull request #3371 from ZappoMan/warningFixes

fix some recently introduced warnings