Fix compiler warnings

[james-d-mitchell]

We observed the following:

[wilfwilson]

I had a look at the bits of code when you first made this issue, and while I don't think that there are bugs underlying these warnings, I agree that it would be nice to get rid of them.