Fix more build errors from GCC 4.6.