[wip] NSX integration fixes

Can you add an empty line before `return`?