diff --git a/C/scanner.c b/C/scanner.c
index c506a8d9d..183863e21 100644
--- a/C/scanner.c
+++ b/C/scanner.c
@@ -557,7 +557,7 @@ token(void)
     my_get_quoted_ch();
     while (1) {
       if (charp + 1024 > (char *)AuxSp) {
-	ErrorMessage = "Heap Overflow While Scanning: please increase heap";
+	ErrorMessage = "Heap Overflow While Scanning: please increase code space (-h)";
 	break;
       }
       if (ch == quote) {
@@ -1292,7 +1292,7 @@ fast_tokenizer(void)
 	my_fgetch();
 	while (1) {
 	  if (charp + 1024 > (char *)AuxSp) {
-	    ErrorMessage = "Heap Overflow While Scanning: please increase heap";
+	    ErrorMessage = "Heap Overflow While Scanning: please increase code space (-h)";
 	    break;
 	  }
 	  if (ch == quote) {
diff --git a/pl/modules.yap b/pl/modules.yap
index 1e05fbdf8..92bc77c97 100644
--- a/pl/modules.yap
+++ b/pl/modules.yap
@@ -551,6 +551,8 @@ source_module(Mod) :-
 	listing(?),
 	nospy(:),
         not(:),
+        phrase(:,?),
+        phrase(:,?,+),
 	retract(:),
 	retract(:,?),
 	retractall(:),