clang 3.4 fixes for tools (nw)