Fixed ns issues.