Assorted validation issues (nw)