diff --git a/C/or_absmi_insts.h b/C/or_absmi_insts.h
index 9031bb8b0..b4b765c03 100644
--- a/C/or_absmi_insts.h
+++ b/C/or_absmi_insts.h
@@ -32,7 +32,7 @@
       Op(either, Osblp);
 #ifdef LOW_LEVEL_TRACER
       if (Yap_do_low_level_trace) {
-        low_level_trace(try_or, (PredEntry *)PREG, NULL);
+        low_level_trace(try_or, PREG->y_u.Osblp.p0, NULL);
       }
 #endif
 #ifdef COROUTINING
diff --git a/C/save.c b/C/save.c
index db3ff53b9..3817a9504 100755
--- a/C/save.c
+++ b/C/save.c
@@ -19,7 +19,8 @@
 static char     SccsId[] = "@(#)save.c	1.3 3/15/90";
 #endif
 
-#include "config.h"
+#include "absmi.h"
+#include "alloc.h"
 #if _MSC_VER || defined(__MINGW32__)
 #if HAVE_WINSOCK2_H
 #include <winsock2.h>
@@ -27,14 +28,12 @@ static char     SccsId[] = "@(#)save.c	1.3 3/15/90";
 #include <windows.h>
 #include <psapi.h>
 #endif
-#include "absmi.h"
-#include "alloc.h"
 #if USE_DL_MALLOC
 #include "dlmalloc.h"
 #endif
-#include "yapio.h"
 #include "YapText.h"
 #include "sshift.h"
+#include "yapio.h"
 #include "Foreign.h"
 #if HAVE_STRING_H
 #include <string.h>