NSX integration fixes

I've commented this in source code