Fix NS calls