Fix bugs found by g++ 4.3.