Fix more warnings

I am getting late on my original schedule, we might finish with this by April (and not March as I was expecting at first). Anyway, this is the next pack of patches to look at (with a warm teacup in hand). Enjoy!