diff --git a/config.h.in b/config.h.in
index c017a1664..99795bff4 100644
--- a/config.h.in
+++ b/config.h.in
@@ -166,6 +166,8 @@
 
 #undef  HAVE_SIGSEGV
 
+#undef  HAVE_ENVIRON
+
 #define  SELECT_TYPE_ARG1    
 #define  SELECT_TYPE_ARG234  
 #define  SELECT_TYPE_ARG5    
diff --git a/pl/directives.yap b/pl/directives.yap
index 1ac2d218e..06e5d41b9 100644
--- a/pl/directives.yap
+++ b/pl/directives.yap
@@ -67,8 +67,8 @@
 	op(P,OPSEC,OP).
 '$exec_directive'(set_prolog_flag(F,V), _, _) :-
 	set_prolog_flag(F,V).
-'$exec_directive'(ensure_loaded(F), _, _) :-
-	'$ensure_loaded'(F).
+'$exec_directive'(ensure_loaded(F), _, M) :-
+	'$ensure_loaded'(F, M).
 '$exec_directive'(char_conversion(IN,OUT), _, _) :-
 	char_conversion(IN,OUT).
 '$exec_directive'(public(P), _, M) :-