nat fixes