diff --git a/compiler2/ttcn3/Statement.cc b/compiler2/ttcn3/Statement.cc
index 90ca67a3390cdeefbb9116a640a501dc90af6432..3db41091534cc4bfad9959437f078a65abf318b9 100644
--- a/compiler2/ttcn3/Statement.cc
+++ b/compiler2/ttcn3/Statement.cc
@@ -678,10 +678,11 @@ namespace Ttcn {
       delete timer_op.timerref;
       delete timer_op.value;
       break;
-    case S_STOP_TIMER:
     case S_TIMEOUT:
-      delete timer_op.timerref;
       delete timer_op.index_redirect;
+      // no break
+    case S_STOP_TIMER:
+      delete timer_op.timerref;
       break;
     case S_SETVERDICT:
       delete setverdict.verdictval;
@@ -1844,12 +1845,13 @@ namespace Ttcn {
       timer_op.timerref->set_my_scope(p_scope);
       if (timer_op.value) timer_op.value->set_my_scope(p_scope);
       break;
-    case S_STOP_TIMER:
     case S_TIMEOUT:
-      if (timer_op.timerref) timer_op.timerref->set_my_scope(p_scope);
       if (timer_op.index_redirect != NULL) {
         timer_op.index_redirect->set_my_scope(p_scope);
       }
+      // no break
+    case S_STOP_TIMER:
+      if (timer_op.timerref) timer_op.timerref->set_my_scope(p_scope);
       break;
     case S_SETVERDICT:
       setverdict.verdictval->set_my_scope(p_scope);
@@ -2116,13 +2118,14 @@ namespace Ttcn {
       timer_op.timerref->set_fullname(p_fullname+".timerref");
       if(timer_op.value) timer_op.value->set_fullname(p_fullname+".timerval");
       break;
-    case S_STOP_TIMER:
     case S_TIMEOUT:
-      if (timer_op.timerref)
-        timer_op.timerref->set_fullname(p_fullname+".timerref");
       if (timer_op.index_redirect != NULL) {
         timer_op.index_redirect->set_fullname(p_fullname + ".redirindex");
       }
+      // no break
+    case S_STOP_TIMER:
+      if (timer_op.timerref)
+        timer_op.timerref->set_fullname(p_fullname+".timerref");
       break;
     case S_SETVERDICT:
       setverdict.verdictval->set_fullname(p_fullname+".verdictval");
@@ -5711,13 +5714,14 @@ error:
       timer_op.timerref->set_code_section(p_code_section);
       if (timer_op.value) timer_op.value->set_code_section(p_code_section);
       break;
-    case S_STOP_TIMER:
     case S_TIMEOUT:
-      if (timer_op.timerref)
-        timer_op.timerref->set_code_section(p_code_section);
       if (timer_op.index_redirect != NULL) {
         timer_op.index_redirect->set_code_section(p_code_section);
       }
+      // no break
+    case S_STOP_TIMER:
+      if (timer_op.timerref)
+        timer_op.timerref->set_code_section(p_code_section);
       break;
     case S_SETVERDICT:
       setverdict.verdictval->set_code_section(p_code_section);
diff --git a/makefiles/Makefile.personal.esekilxxen1843.rnd.ericsson.se b/makefiles/Makefile.personal.esekilxxen1843.rnd.ericsson.se
index 6ce59c3f8b3b739a6861b60c46f235144fd067a9..dd82ca457d4adc139b871100dd5d8f6e947e61a9 100644
--- a/makefiles/Makefile.personal.esekilxxen1843.rnd.ericsson.se
+++ b/makefiles/Makefile.personal.esekilxxen1843.rnd.ericsson.se
@@ -20,4 +20,3 @@ BISON := /usr/bin/bison
 JDKDIR := /proj/TTCN/Tools/jdk1.6.0_34
 XMLDIR := /usr
 OPENSSL_DIR := /usr
-DEBUG := yes
diff --git a/makefiles/Makefile.personal.esekiux5120 b/makefiles/Makefile.personal.esekiux5120
index 1cd1ca7a357fa52659116bf350e8850c67ef5b5d..5b2ab9400220b165c102de73bfda63a71a039a5f 100644
--- a/makefiles/Makefile.personal.esekiux5120
+++ b/makefiles/Makefile.personal.esekiux5120
@@ -21,5 +21,3 @@ JDKDIR  := /proj/TTCN/Tools/jdk1.6.0_23
 XMLDIR  := /app/libxml/2.9.1
 
 OPENSSL_DIR := /proj/TTCN/Tools/openssl-0.9.8r
-
-DEBUG := yes