vkhitrin

diff --git a/src/lib/in.c b/src/lib/in.c
index ae97dd29..f2f60f10 100644
--- a/src/lib/in.c
+++ b/src/lib/in.c
@@ -1868,7 +1868,7 @@ build_cflow_automaton(inputctx* ictx){
     { "[?1;2S", NULL, }, // negative cregs XTSMGRAPHICS
     { "[?1;3S", NULL, }, // negative cregs XTSMGRAPHICS
     { "[?1;3;S", NULL, }, // iterm2 negative cregs XTSMGRAPHICS
-    { "[?1;3;0S", NULL, }, // negative cregs XTSMGRAPHICS
+    { "[?1;3;\\NS", NULL, }, // negative cregs XTSMGRAPHICS

vkhitrin

diff --git a/common/options/config.c b/common/options/config.c
index dd9f6ec..7619bb2 100644
--- a/common/options/config.c
+++ b/common/options/config.c
@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <errno.h>
-#include <error.h>
+#include <mach/error.h>

vkhitrin

diff --git a/daemon/journal.c b/daemon/journal.c
index a2a1c73..471ba28 100644
--- a/daemon/journal.c
+++ b/daemon/journal.c
@@ -25,8 +25,8 @@
 #ifdef HAVE_ENDIAN_H
 #include <endian.h>
 #endif
-#ifdef HAVE_SYS_ENDIAN_H
-#include <sys/endian.h>

vkhitrin

diff --git a/test-data/blank-disks/Makefile.am b/test-data/blank-disks/Makefile.am
index 2464869..6e0bc79 100644
--- a/test-data/blank-disks/Makefile.am
+++ b/test-data/blank-disks/Makefile.am
@@ -53,4 +53,4 @@ blank-disk-1M.qcow2:
 	qemu-img create -f qcow2 -o preallocation=metadata $@ 1M
 
 blank-disk-with-backing.qcow2: blank-disk-1M.raw
-	qemu-img create -f qcow2 -b $^ $@
+	qemu-img create -f qcow2 -F raw -b $^ $@

vkhitrin

diff --git a/common/mlstdutils/std_utils.ml b/common/mlstdutils/std_utils.ml
index 29add4a..326dcdc 100644
--- a/common/mlstdutils/std_utils.ml
+++ b/common/mlstdutils/std_utils.ml
@@ -307,12 +307,12 @@ module List = struct
       | x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs
       | _ -> invalid_arg "combine3"
 
-    let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function
+    let rec assoc_lbl ?(cmp = Stdlib.compare) ~default x = function

vkhitrin

diff --git a/common/mlstdutils/std_utils.ml b/common/mlstdutils/std_utils.ml
index 29add4a..326dcdc 100644
--- a/common/mlstdutils/std_utils.ml
+++ b/common/mlstdutils/std_utils.ml
@@ -307,12 +307,12 @@ module List = struct
       | x::xs, y::ys, z::zs -> (x, y, z) :: combine3 xs ys zs
       | _ -> invalid_arg "combine3"
 
-    let rec assoc_lbl ?(cmp = Pervasives.compare) ~default x = function
+    let rec assoc_lbl ?(cmp = Stdlib.compare) ~default x = function