diff --git a/pl/boot.yap b/pl/boot.yap
index dc4d53254..325dd514c 100644
--- a/pl/boot.yap
+++ b/pl/boot.yap
@@ -376,7 +376,7 @@ true :- true.
  % but YAP and SICStus does.
  %
  '$process_directive'(G, _, M) :-
-	 ( '$do_yes_no'(G,M) -> true ; format(user_error,':- ~w:~w failed.~n',[M,G]) ).
+	 ( '$notrace'(M:G) -> true ; format(user_error,':- ~w:~w failed.~n',[M,G]) ).
 
  '$continue_with_command'(reconsult,V,Pos,G,Source) :-
 	 '$go_compile_clause'(G,V,Pos,5,Source),
@@ -1177,7 +1177,7 @@ throw(Ball) :-
 '$run_toplevel_hooks' :-
 	nb_getval('$break',0),
 	recorded('$toplevel_hooks',H,_), !,
-	( '$execute'(H) -> true ; true).
+	( '$oncenotrace'(H) -> true ; true).
 '$run_toplevel_hooks'.
 
 '$enter_system_mode' :-
@@ -1214,7 +1214,15 @@ throw(Ball) :-
 	    
 
 '$oncenotrace'(M:G) :-
-	'$execute_nonstop'(G, M), !.
+	yap_hacks:disable_interrupts,
+	(
+	 '$execute'(G),
+	 !,
+	 yap_hacks:enable_interrupts
+	;
+	 yap_hacks:enable_interrupts,
+	 fail
+	). 
 
 '$run_at_thread_start' :-
 	recorded('$thread_initialization',M:D,_),
diff --git a/pl/consult.yap b/pl/consult.yap
index 096f2b990..1ac4779c6 100644
--- a/pl/consult.yap
+++ b/pl/consult.yap
@@ -314,7 +314,7 @@ use_module(M,F,Is) :-
 	recorded('$system_initialisation',G,R),
 	erase(R),
 	G \= '$',
-	call(G),
+	'$notrace'(G),
 	fail.
 '$exec_initialisation_goals' :-
 	'$show_consult_level'(Level1),
@@ -327,7 +327,7 @@ use_module(M,F,Is) :-
         ( OldMode == on -> '$exit_system_mode' ; true ),
 	% run initialization under user control (so allow debugging this stuff).
 	(
-	  '$system_catch'(once(M:G), M, Error, user:'$LoopError'(Error, top)),
+	  '$system_catch'('$oncenotrace'(M:G), M, Error, user:'$LoopError'(Error, top)),
 	  fail
 	;
           OldMode = on,