diff --git a/changes4.3.html b/changes4.3.html
index 9b5bb1a4b..492764f19 100644
--- a/changes4.3.html
+++ b/changes4.3.html
@@ -17,6 +17,10 @@
 <h2>Yap-4.3.23:</h2>
 <ul>
 
+	<li>FIXED: make call_with_args/* check if first arg is atom.</li>
+	<li>FIXED: make cd/1 complain on bugs.</li>
+	<li>FIXED: always do something on gmp allocation (request from
+	Roberto Bagnara).</li>
 	<li>FIXED: always allow abolish on static predicates.</li>
 	<li>UPDATE: include new apply_macros code from Erick Alphonse,
 	and acknowledge J. Schimpf.</li>
diff --git a/console/yap.c b/console/yap.c
index 301bec7c7..e533d2279 100644
--- a/console/yap.c
+++ b/console/yap.c
@@ -145,7 +145,7 @@ do_bootfile (char *bootfilename)
   Term term_nil = MkAtomTerm(YapLookupAtom("[]"));
   Term term_end_of_file = MkAtomTerm(YapLookupAtom("end_of_file"));
   Term term_true = MkAtomTerm(YapLookupAtom("true"));
-  Term functor_query = MkFunctor(YapLookupAtom("?-"),1);
+  Functor functor_query = MkFunctor(YapLookupAtom("?-"),1);
 
 
   fprintf(stderr,"Entering Yap\n");
diff --git a/include/yap_structs.h b/include/yap_structs.h
index 9f01190b4..a3e2e4729 100644
--- a/include/yap_structs.h
+++ b/include/yap_structs.h
@@ -36,7 +36,11 @@ typedef long int Int;
 
 typedef double flt;
 
-typedef CELL Term, Functor, Atom;
+typedef CELL Term;
+
+typedef struct FunctorEntry *Functor;
+
+typedef struct AtomEntry *Atom;
 
 #ifndef TRUE
 #define TRUE	1