diff --git a/app/lib/Angel.coffee b/app/lib/Angel.coffee
index aae10c724..ce4281978 100644
--- a/app/lib/Angel.coffee
+++ b/app/lib/Angel.coffee
@@ -9,7 +9,7 @@ module.exports = class Angel extends CocoClass
   @nicks: ['Archer', 'Lana', 'Cyril', 'Pam', 'Cheryl', 'Woodhouse', 'Ray', 'Krieger']
 
   infiniteLoopIntervalDuration: 7500  # check this often
-  infiniteLoopTimeoutDuration: 5000  # wait this long for a response when checking
+  infiniteLoopTimeoutDuration: 10000  # wait this long for a response when checking
   abortTimeoutDuration: 500  # give in-process or dying workers this long to give up
 
   constructor: (@shared) ->
diff --git a/app/lib/simulator/Simulator.coffee b/app/lib/simulator/Simulator.coffee
index baa8ba6ee..cd210ee6e 100644
--- a/app/lib/simulator/Simulator.coffee
+++ b/app/lib/simulator/Simulator.coffee
@@ -400,7 +400,7 @@ module.exports = class Simulator extends CocoClass
       executionLimit: 1 * 1000 * 1000
     if methodName is 'hear'
       aetherOptions.functionParameters = ['speaker', 'message', 'data']
-    if methodName is 'bid'
+    if methodName is 'makeBid'
       aetherOptions.functionParameters = ['blockNumber']
     #console.log "creating aether with options", aetherOptions
     return new Aether aetherOptions
diff --git a/app/lib/world/world.coffee b/app/lib/world/world.coffee
index fa075995f..9492c2e01 100644
--- a/app/lib/world/world.coffee
+++ b/app/lib/world/world.coffee
@@ -96,7 +96,7 @@ module.exports = class World
         for thang in @thangs when thang.isProgrammable
           userCode = @userCodeMap[thang.id] ? {}
           for methodName, aether of userCode
-            framesToLoadFlowBefore = if methodName is 'plan' then 200 else 1  # Adjust if plan() is taking even longer
+            framesToLoadFlowBefore = if methodName is 'plan' or methodName is 'makeBid' then 200 else 1  # Adjust if plan() is taking even longer
             aether._shouldSkipFlow = i < loadUntilFrame - framesToLoadFlowBefore
       try
         @getFrame(i)
diff --git a/app/views/play/common/ladder_submission_view.coffee b/app/views/play/common/ladder_submission_view.coffee
index 3a752c20f..48971f557 100644
--- a/app/views/play/common/ladder_submission_view.coffee
+++ b/app/views/play/common/ladder_submission_view.coffee
@@ -92,7 +92,7 @@ module.exports = class LadderSubmissionView extends CocoView
           includeFlow: false
           executionLimit: 1 * 1000 * 1000
         if spellID is "hear" then aetherOptions["functionParameters"] = ["speaker","message","data"]
-        if spellID is "bid" then aetherOptions["functionParameters"] = ["blockNumber"]
+        if spellID is "makeBid" then aetherOptions["functionParameters"] = ["blockNumber"]
 
         aether = new Aether aetherOptions
         transpiledCode[thang][spellID] = aether.transpile spell
diff --git a/scripts/transpile.coffee b/scripts/transpile.coffee
index 538b9c1d0..cb9551f5f 100644
--- a/scripts/transpile.coffee
+++ b/scripts/transpile.coffee
@@ -41,7 +41,7 @@ transpileLevelSession = (sessionID, cb) ->
           includeFlow: false
           executionLimit: 1 * 1000 * 1000
         if spellID is "hear" then aetherOptions["functionParameters"] = ["speaker","message","data"]
-        if spellID is "bid" then aetherOptions["functionParameters"] = ["blockNumber"]
+        if spellID is "makeBid" then aetherOptions["functionParameters"] = ["blockNumber"]
 
         aether = new Aether aetherOptions
         transpiledCode[thang][spellID] = aether.transpile spell