Merge pull request #3235 from jenshnielsen/more_warnings

Silence some more warnings