Fix compile warnings as seen on g++ 4.4.7