decode fixes (nw)