Fix GCC 4.8 fixes

Previous change didn't make sense, sizeof would always return 1.