Fixed NS issues