Fix issues with ns_no_expire