More GCC 4.7 fixes