some more gcc 4.6 fixes