NSX integration fixes