Cherry pick nsx fixes from next
[james-page,r=gnuoy] Cherry pick nsx fixes from next