another set of gcc 4.8 fixes