moar nat fixes