Fix a couple of compiler warnings in the optimised build.