diff --git a/C/tracer.c b/C/tracer.c
index 125d44b27..d59c25446 100644
--- a/C/tracer.c
+++ b/C/tracer.c
@@ -130,7 +130,7 @@ low_level_trace(yap_low_level_port port, PredEntry *pred, CELL *args)
   extern int gc_calls;
 
   vsc_count++;
-  if (vsc_count < 369599) return;
+  /* if (vsc_count < 369599) return; */
   /* if (vsc_count > 500000) exit(0); */
   /* if (gc_calls < 1) return;*/
   YP_fprintf(YP_stderr,"%lu ", vsc_count);
diff --git a/pl/boot.yap b/pl/boot.yap
index 0b8fadd84..e7398aea2 100644
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -652,17 +652,23 @@ incore(G) :- '$execute'(G).
 	'$execute_within'(A),
 	'$last_execute_within'(B).
 
+';'((A->B),C) :- !,
+	( '$execute_within'(A) -> '$execute_within'(B) ;
+	  '$execute_within'(C) ).
 ';'(A,B) :-
 	( '$execute_within'(A) ;
 	  '$execute_within'(B) ).
 
+'|'((A->B),C) :- !,
+	( '$execute_within'(A) -> '$execute_within'(B) ;
+	  '$execute_within'(C) ).
 '|'(A,B) :-
 	( '$execute_within'(A) ;
 	  '$execute_within'(B) ).
 
 '->'(A,B) :-
 	( '$execute_within'(A) ->
-	  '$execute_within'(B) ).
+	  '$last_execute_within'(B) ).
 
 \+(A) :-
 	\+ '$execute_within'(A).