GCC 4.7 fix ups