Fix listsamples and one other potential problematic place, and fixed better devctrl (nw)