diff --git a/scripts/Util.pm b/scripts/Util.pm
index ec70100..90db16e 100644
--- a/scripts/Util.pm
+++ b/scripts/Util.pm
@@ -252,7 +252,7 @@ sub select_experiment {
 
         push @exp_with_notes,
           ( defined $info && length($info) > 0 )
-          ? sprintf( "%-50s (Note: %s)", $exp, $info )
+          ? sprintf( "%-50s (%s)", $exp, $info )
           : $exp;
     }
 
@@ -260,7 +260,7 @@ sub select_experiment {
       TUI::select_from_list( "Select Experiment", $multi, @exp_with_notes );
     die "No experiment selected" unless @selected_experiments;
 
-    map { s/(.*?)\s+\(Note:.+\)$/$1/ } @selected_experiments;
+    map { s/(.*?)\s+\(.+\)$/$1/ } @selected_experiments;
 
     return $multi == 1 ? @selected_experiments : $selected_experiments[0];
 }
diff --git a/scripts/menu.pl b/scripts/menu.pl
index e5ae11c..34cd8e4 100644
--- a/scripts/menu.pl
+++ b/scripts/menu.pl
@@ -322,11 +322,7 @@ my %handlers = (
     '16. Plot Results' => sub {
 
         # Generate R ggplot2 charts
-        my @experiments = Util::find_subdirs($local_archive_dir);
-        my @selected_experiments =
-          TUI::select_from_list( "Select Experiments to Plot", 1,
-            @experiments );
-        die "No experiment selected" unless @selected_experiments;
+        my @selected_experiments = Util::select_experiment(1);
 
         my @charts = map { s/\.r//r } Util::find_files($local_charts_dir);
         my @selected_charts =
diff --git a/scripts/runner.pl b/scripts/runner.pl
index a1aa512..e6fca0d 100644
--- a/scripts/runner.pl
+++ b/scripts/runner.pl
@@ -48,6 +48,8 @@ sub trace {
             "-e $remote_builds_dir/$experiment/system.elf",
             "-i $remote_builds_dir/$experiment/system.iso",
             "--",
+            "-Wf,--full-trace",
+            "-Wf,--check-bounds",
             "-Wf,--start-symbol=fail_start_trace",
             "-Wf,--save-symbol=fail_start_trace",
             "-Wf,--end-symbol=fail_stop_trace",