NSX integration fixes

Added