Avoid some g++ compiler warnings