NSX integration fixes

Seems to be OK