Fixups for GCC 4.7?