[wip] NSX integration fixes

Reminder about this :-)