Moar fixing with gcc 4.8+