NSX integration fixes

Can you include a license header?