diff --git a/scripts/build.pl b/scripts/build.pl
index 8a5c028..a32201d 100755
--- a/scripts/build.pl
+++ b/scripts/build.pl
@@ -47,6 +47,7 @@ die "No mode selected" unless @selected_modes;
 
 # Select 0.info contents
 my $info = join " ", TUI::select_from_list( "Select '0.info' Contents for ", 1, (
+    "baseline",
     "--catch-outer",
     "--catch-text",
     ".wamr_mmap",
diff --git a/scripts/deploy.pl b/scripts/deploy.pl
index 92cae4f..60bb8f9 100755
--- a/scripts/deploy.pl
+++ b/scripts/deploy.pl
@@ -19,7 +19,7 @@ my $local_builds_dir = "$local_root/builds";
 my $remote_root       = '/home/lab/smchurla/Documents/failnix';
 my $remote_builds_dir = "$remote_root/builds";
 my $remote_runner     = "$remote_root/scripts/multi_runner.pl";
-my $remote_log        = "$remote_root/runner.log";
+my $remote_log        = "$remote_root/multi_runner.log";
 
 # Upload new experiments
 my @experiments = grep { /fail/ } Util::find_subdirs($local_builds_dir);
diff --git a/scripts/multi_runner.pl b/scripts/multi_runner.pl
index e28f328..13c7b45 100644
--- a/scripts/multi_runner.pl
+++ b/scripts/multi_runner.pl
@@ -19,7 +19,9 @@ my @experiments = Util::find_subdirs($remote_builds_dir);
 for my $experiment (@experiments) {
     say "Running experiment: $experiment";
     my $experiment_runner = "$remote_builds_dir/$experiment/runner.pl";
-    system( "perl", $experiment_runner, $experiment ) == 0
+    system( "perl", $experiment_runner, $experiment,
+        ">", Util::shell_quote("$remote_builds_dir/$experiment/0_runner.log"),
+        "2>&1" ) == 0
       or warn "runner.pl failed for $experiment: $?";
 }
 
diff --git a/scripts/runner.pl b/scripts/runner.pl
index 9b0f131..c8bd524 100644
--- a/scripts/runner.pl
+++ b/scripts/runner.pl
@@ -219,8 +219,8 @@ sub inject {
         # "-Wf,--server-port=$fail_server_port",
         "-Wf,--state-dir=$remote_builds_dir/$experiment/state",
         "-Wf,--trap",
-        #"-Wf,--catch-outerspace",
-        #"-Wf,--catch-write-textsegment",
+        "-Wf,--catch-outerspace",
+        "-Wf,--catch-write-textsegment",
         "-Wf,--timeout=500000",
         "-Wf,--ok-marker=fail_marker_positive",
         "-Wf,--fail-marker=fail_marker_negative",