some c++11 compilation fixes (nw)