diff --git a/src/laminar.cpp b/src/laminar.cpp
index b5e4165..9de858a 100644
--- a/src/laminar.cpp
+++ b/src/laminar.cpp
@@ -645,8 +645,8 @@ bool Laminar::tryStartRun(std::shared_ptr<Run> run, int queueIndex) {
             });
 
             // Actually schedules the Run steps
-            kj::Promise<void> exec = handleRunStep(run.get()).then([this,r=run.get()]{
-                runFinished(r);
+            kj::Promise<void> exec = handleRunStep(run.get()).then([=]{
+                runFinished(run.get());
             });
             if(run->timeout > 0) {
                 exec = exec.attach(srv->addTimeout(run->timeout, [r=run.get()](){
diff --git a/src/run.h b/src/run.h
index 8ca6b43..eae55d0 100644
--- a/src/run.h
+++ b/src/run.h
@@ -83,7 +83,7 @@ public:
     kj::Maybe<pid_t> current_pid;
     int output_fd;
     std::unordered_map<std::string, std::string> params;
-    int timeout;
+    int timeout = 0;
 
     time_t queuedAt;
     time_t startedAt;