diff --git a/app/benchmark/timing/copter.cc b/app/benchmark/timing/copter.cc
index d9d280391fee47703e97558a266de0cbd8cc2111..1663de31c5426deb954b007325279ab71e02a7bc 100644
--- a/app/benchmark/timing/copter.cc
+++ b/app/benchmark/timing/copter.cc
@@ -144,13 +144,11 @@ TASK(CopterControlWatchdogTask) {
 void PreIdleHook() {
     static int count = 0;
     kout << "---\n";
+    timing_print();
     if (++count > 5) {
-        if (timing_print() > 0) {
-            ShutdownMachine();
-        }
     }
 
-    if (count == 50) {
+    if (count == 100) {
         timing_dump();
     }
 }
diff --git a/arch/patmos/tcb.cc b/arch/patmos/tcb.cc
index d36949a9c10c82a451fd2b0fc8f062bbca189bad..e5f0e3024fb402db0a62a40071f6aef5a3c313b3 100644
--- a/arch/patmos/tcb.cc
+++ b/arch/patmos/tcb.cc
@@ -56,9 +56,12 @@ void context_load(const TCB *to) {
 	"ret                  \n"
 	"mts $s3 = $r11       \n"
 	"mts $s0 = $r9        \n"
-	"nop"
+ 	"nop"
         : : "r"(to->dynamic_context)
     );
+switch_context_load:
+    (void) && switch_context_load;
+
 }
 
 
@@ -126,6 +129,9 @@ void context_save_and_load(const TCB * from, const TCB *to) {
 	"nop"
         : : "r" (from->dynamic_context), "r"(to->dynamic_context)
     );
+switch_context_save_and_load:
+    (void) && switch_context_save_and_load;
+
 }
 
 void arch::TCB::context_switch(const TCB *from, const TCB* to) {