Avoid some random compiler warnings on various platforms.
6 files changed