Updates for GCC 4.6