diff --git a/C/terms.c b/C/terms.c
index bb7fedf24..9629ed11e 100644
--- a/C/terms.c
+++ b/C/terms.c
@@ -367,7 +367,7 @@ static int cycles_in_complex_term(register CELL *pt0,
         ptd0 = RepAppl(d0);
         f = (Functor)(d0 = *ptd0);
         if (IsExtensionFunctor(f)) {
-        *ptf++ = d0;
+	  *ptf++ = AbsAppl(ptd0);
         continue;
       }
        if (IS_VISIT_MARKER) {
@@ -1228,7 +1228,7 @@ static Int numbervars_in_complex_term(CELL * pt0, CELL * pt0_end, Int numbv,
   if (IsAttVar(pt0))
     continue;
   /* do or pt2 are unbound  */
-  if (singles || 0)
+  if (singles)
     d0 = numbervar_singleton(PASS_REGS1);
   else
     d0 = numbervar(numbv++ PASS_REGS);
@@ -1384,6 +1384,8 @@ static Int t_ref(cl_connector *d, cl_connector * q, int max) {
 static Int create_entry(Term t, Int i, Int j,  cl_connector * q, Int max) {
   Term ref, h, *s, *ostart;
   ssize_t n;
+  //  fprintf(stderr,"[%ld,%ld]/%ld, %lx\n",i,j,max,t);
+
   // first time, create a new term
   if (IsVarTerm(t)) {
     return -1;
@@ -1482,7 +1484,6 @@ Term Yap_BreakCycles(Term inp, UInt arity, Term * listp USES_REGS) {
     return t;
   } else {
     // initialization
-    fprintf(stderr,"C i=%ld,%ld   %lx\n",  i, 0, q[i].copy[0]);      }
   qlen = create_entry(Deref(t), i, 0, q, qlen);
     while(i<qlen) {
       arity_t n, j;
diff --git a/C/write.c b/C/write.c
index 2a5ec14ff..61544ce99 100644
--- a/C/write.c
+++ b/C/write.c
@@ -1103,6 +1103,7 @@ void Yap_plwrite(Term t, StreamDesc *mywrite, int max_depth, int flags,
   wglb.Write_Loops = flags & Handle_cyclics_f;
   wglb.Quote_illegal = flags & Quote_illegal_f;
   wglb.MaxArgs = 0 ;
+  wglb.MaxDepth = 0 ;
   wglb.lw = separator;
   Term tp;
   
diff --git a/packages/bdd/bdd.yap b/packages/bdd/bdd.yap
index 19b98fea7..e59e78557 100644
--- a/packages/bdd/bdd.yap
+++ b/packages/bdd/bdd.yap
@@ -419,4 +419,6 @@ fetch(pp(P,_,_,_)._Tree, -1, N) :- N is 1-P.
 fetch(pn(P,_,_,_)._Tree, 1, P).
 fetch(pn(P,_,_,_)._Tree, -1, N) :- N is 1-P.
 
+
 %% @}
+
diff --git a/packages/python/yap_kernel/yap_ipython/terminal/debugger.py b/packages/python/yap_kernel/yap_ipython/terminal/debugger.py
index e166d3f39..f3947aec2 100644
--- a/packages/python/yap_kernel/yap_ipython/terminal/debugger.py
+++ b/packages/python/yap_kernel/yap_ipython/terminal/debugger.py
@@ -8,11 +8,11 @@ from .ptutils import IPythonPTCompleter
 from .shortcuts import suspend_to_bg, cursor_in_leading_ws
 
 from prompt_toolkit.enums import DEFAULT_BUFFER
-from prompt_toolkit.filters import (Condition, has_focus, has_selection,
-    vi_insert_mode, emacs_insert_mode)
-from prompt_toolkit.key_binding import KeyBindings
+from prompt_toolkit.filters import (Condition, HasFocus, HasSelection,
+    ViInsertMode, EmacsInsertMode)
+from prompt_toolkit.keys import Keys
+from prompt_toolkit.key_binding.manager import KeyBindingManager
 from prompt_toolkit.key_binding.bindings.completion import display_completions_like_readline
-from pygments.token import Token
 from prompt_toolkit.shortcuts.prompt import PromptSession
 from prompt_toolkit.enums import EditingMode
 from prompt_toolkit.formatted_text import PygmentsTokens
diff --git a/regression/cyclics.yap b/regression/cyclics.yap
index 9efd361f8..120568cd4 100644
--- a/regression/cyclics.yap
+++ b/regression/cyclics.yap
@@ -70,6 +70,7 @@ d(X, (  X= f(X,X)) ).
 d(X, (  X= f(_,X)) ).
 d(X, (  X= f(A,A,X)) ).
 d(X, (  X= f(A,A,g(A))) ).
+d(X, (  X= f(A,A,2.3)) ).
 d(X, (  X= f(A,g(X,[A|A]),X)) ).
 d(X, (  X= f(X,[X,X])) ).
 d(X, (  X= f(3.14,[22.3,X])) ).