Fix GCC 4.8+ errors