More ns fixes