more gcc4.7 fixes