Again, the fire immunity not making you immune to the desert environmental affects does not belong here. They are separate things (fire damage vs. non-lethal damage). You can change that, but I don't think it could be called a dysfunctional rule. What could is that creatures that do not require drink still suffering the affects.