NSX integration fixes

No need to move that code as it's not in the `unless` anymore