diff -ur Yap-5.1.2.orig/C/analyst.c Yap-5.1.2/C/analyst.c
--- Yap-5.1.2.orig/C/analyst.c	2006-11-29 03:10:19.000000000 +1300
+++ Yap-5.1.2/C/analyst.c	2007-08-21 19:58:15.000000000 +1200
@@ -312,19 +312,17 @@
     total;
   Term t1;
   Atom at1;
+  char *program;
+  wchar_t *programw;
 
   t1 = Deref(ARG1);
   if (IsVarTerm(t1) || !IsAtomTerm(t1))
     return (FALSE);
   at1 = AtomOfTerm(t1);
   if (IsWideAtom(at1)) {
-    wchar_t *program;
-
-    program = RepAtom(at1)->WStrOfAE;
-    fprintf(Yap_stderr, "\n Instructions Executed in %S\n", program);
+    programw = RepAtom(at1)->WStrOfAE;
+    fprintf(Yap_stderr, "\n Instructions Executed in %S\n", programw);
   } else {
-    char *program;
-
     program = RepAtom(at1)->StrOfAE;
     fprintf(Yap_stderr, "\n Instructions Executed in %s\n", program);
   }
@@ -675,7 +673,10 @@
   fprintf(Yap_stderr, "   TOTAL            instructions: %8d (%3d%%)\n\n", total,
 	     (total * 100) / total);
 
-  fprintf(Yap_stderr, "\n Analysis of Unification Instructions in %s \n", program);
+  if (IsWideAtom(at1))
+    fprintf(Yap_stderr, "\n Analysis of Unification Instructions in %S \n", programw);
+  else
+    fprintf(Yap_stderr, "\n Analysis of Unification Instructions in %s \n", program);
   fprintf(Yap_stderr, "           XVAR,   YVAR,    XVAL,    YVAL,     CONS,     LIST,  STRUCT\n");
   fprintf(Yap_stderr, "  GET: %8d %8d %8d %8d %8d %8d %8d\n",
 	     c_get.nxvar,
diff -ur Yap-5.1.2.orig/H/Yap.h Yap-5.1.2/H/Yap.h
--- Yap-5.1.2.orig/H/Yap.h	2007-04-11 10:13:20.000000000 +1200
+++ Yap-5.1.2/H/Yap.h	2007-08-22 19:39:03.000000000 +1200
@@ -53,12 +53,6 @@
 #undef TRAILING_REQUIRES_BRANCH
 #endif /* YAPOR || TABLING */
 
-#if ANALYST
-#ifdef USE_THREADED_CODE
-#undef USE_THREADED_CODE
-#endif
-#endif
-
 #ifdef  COROUTINING
 #ifndef TERM_EXTENSIONS
 #define TERM_EXTENSIONS 1