Update source to work with GCC 4.7 toolchain (Thanks to faux)