second round of clang 3.4 fixes for MESS (nw)