Fix GCC 4.8 build errors