NSX integration fixes

No worries, I really like polish code