more ns fixes