Fix ns imports