Fix validation errors (nw)