diff --git a/src/allmain.c b/src/allmain.c
index 900259835..de31c6420 100644
--- a/src/allmain.c
+++ b/src/allmain.c
@@ -301,16 +301,12 @@ boolean resuming;
                         past_clock = moves - timeout_start;
                         if (past_clock > 0)
                             monclock = MIN_MONGEN_RATE * 30000 / (past_clock + 30000);
-                        if (monclock > MIN_MONGEN_RATE / 2 && (u.uconduct.wishes >= 1L))
-                            monclock = MIN_MONGEN_RATE / 2;
                         if (monclock > MIN_MONGEN_RATE / 4 && (u.uconduct.wishes >= 2L))
                             monclock = MIN_MONGEN_RATE / 4;
                         if (monclock > MIN_MONGEN_RATE / 6 && (u.uconduct.wishes >= 3L))
                             monclock = MIN_MONGEN_RATE / 6;
                         if (monclock > MIN_MONGEN_RATE / 8 && (u.uconduct.wishes >= 4L))
                             monclock = MIN_MONGEN_RATE / 8;
-                        if (monclock > MIN_MONGEN_RATE / 10 && (u.uconduct.wishes >= 5L))
-                            monclock = MIN_MONGEN_RATE / 10;
                     }
 		            /* make sure we don't fall off the bottom */
                     if (monclock < MAX_MONGEN_RATE)
diff --git a/src/dungeon.c b/src/dungeon.c
index 56151e62c..97d54daee 100644
--- a/src/dungeon.c
+++ b/src/dungeon.c
@@ -1682,7 +1682,8 @@ level_difficulty()
         res += 15;
     }
     /* Wishes increase difficulty */
-    res += (int) u.uconduct.wishes * 5;
+    if (u.uconduct.wishes > 1)
+        res += (int) (u.uconduct.wishes - 1) * 4;
     return (xchar) res;
 }