Clean up various compile warnings
Workaround internal deprecation warnings
Clean up test:compile warnings
Merge pull request #3323 from pvlugter/warnings

Clean up warnings