More g++ 4.8 fixes