GCC 4.6 compilation fixes.