GCC 4.6 compatibility fixes.