GCC 4.6 fixes to cleanups