[wip] NSX integration fixes

Why not merge this in the lines above?