Fix some of the compilation warnings spewed by g++