[wip] NSX integration fixes

No new line here, please :-)