Fix more errors on GCC 4.3.3.