NT Minor fixes
NT Minor changes