more gcc 4.7 fixes