More GCC 4.6 fixes.