diff --git a/src/common/kernel/move.c b/src/common/kernel/move.c
index 8aad0c44c..01240cc70 100644
--- a/src/common/kernel/move.c
+++ b/src/common/kernel/move.c
@@ -483,7 +483,7 @@ do_maelstrom(region *r, unit *u)
   int damage;
   ship * sh = u->ship;
 
-  damage = rng_int()%150 - eff_skill(u, SK_SAILING, r)*5;
+  damage = rng_int()%75 + rng_int()%75 - eff_skill(u, SK_SAILING, r)*4;
 
   if (damage <= 0) {
     return sh;
@@ -1745,7 +1745,8 @@ sail(unit * u, order * ord, boolean move_on_land, region_list **routep)
         break;
       }
 
-      if (is_cursed(next_point->attribs, C_MAELSTROM, 0)) {
+      
+      if (curse_active(get_curse(next_point->attribs, ct_find("maelstrom")))) {
         if (do_maelstrom(next_point, u) == NULL) break;
       }
 
diff --git a/src/common/kernel/terrain.c b/src/common/kernel/terrain.c
index a2a1b642b..08f9929f6 100644
--- a/src/common/kernel/terrain.c
+++ b/src/common/kernel/terrain.c
@@ -127,7 +127,7 @@ terrain_name(const struct region * r)
   if (r->terrain->name!=NULL) {
     return r->terrain->name(r);
   } else if (fval(r->terrain, SEA_REGION)) {
-    if (is_cursed(r->attribs, C_MAELSTROM, 0)) {
+    if (curse_active(get_curse(next_point->attribs, ct_find("maelstrom")))) {
       return "maelstrom";
     }
   }