Patches to build with GCC 4.7 Toolchain