Clang compile fix (nw)