Fix issues in shared NSI flow in NSMF