Fix GCC 4.8+ / Clang compiles (nw)