Clang fix (nw)