Water demons should resist cold instead of (or in addition to) fire.

Have some water demons, moccasins and nymphs appear on the Plane of Water, in order to imply that this is the dimension from which they’re being summoned into fountains.

When you get a wish from a water demon, it uses the cursed/unlucky wish logic because you’re making a deal with a demon.

Djinni released from bottles and water demons released from fountains don’t care about beatitude or depth for giving a wish; instead they will give the hero a wish if the hero is intimidating enough. “Intimidation” is based on stats like Charisma and XL, and the chance of successfully intimidating them increases as they do. Djinni from lamps are not affected by these rules.