NSX integration fixes

Added, thank you for poitting this