diff --git a/binr/rabin2/Makefile b/binr/rabin2/Makefile
index ebc7bfd5e3..26c5f8a8ba 100644
--- a/binr/rabin2/Makefile
+++ b/binr/rabin2/Makefile
@@ -8,3 +8,4 @@ include ../rules.mk
 include ../../libr/socket/deps.mk
 include ../../shlr/zip/deps.mk
 include ../../shlr/gdb/deps.mk
+include ../../shlr/bochs/deps.mk
diff --git a/binr/radare2/Makefile b/binr/radare2/Makefile
index bf91a0969d..0384e82bb7 100644
--- a/binr/radare2/Makefile
+++ b/binr/radare2/Makefile
@@ -64,3 +64,4 @@ include ../../libr/socket/deps.mk
 include ../../shlr/zip/deps.mk
 include ../../shlr/gdb/deps.mk
 include ../../shlr/java/deps.mk
+include ../../shlr/bochs/deps.mk
diff --git a/binr/radiff2/Makefile b/binr/radiff2/Makefile
index 3f335bbe1f..59967b8146 100644
--- a/binr/radiff2/Makefile
+++ b/binr/radiff2/Makefile
@@ -13,3 +13,4 @@ endif
 include ../../libr/socket/deps.mk
 include ../../shlr/zip/deps.mk
 include ../../shlr/gdb/deps.mk
+include ../../shlr/bochs/deps.mk
diff --git a/binr/rafind2/Makefile b/binr/rafind2/Makefile
index d2bcc34b85..738bbb058e 100644
--- a/binr/rafind2/Makefile
+++ b/binr/rafind2/Makefile
@@ -7,3 +7,4 @@ include ../rules.mk
 include ../../libr/socket/deps.mk
 include ../../shlr/zip/deps.mk
 include ../../shlr/gdb/deps.mk
+include ../../shlr/bochs/deps.mk
diff --git a/binr/ragg2/Makefile b/binr/ragg2/Makefile
index 38da17eb4c..1cbecea542 100644
--- a/binr/ragg2/Makefile
+++ b/binr/ragg2/Makefile
@@ -6,3 +6,4 @@ BINDEPS+=r_magic r_cons r_util
 
 include ../rules.mk
 include ../../libr/socket/deps.mk
+include ../../shlr/bochs/deps.mk
diff --git a/binr/rahash2/Makefile b/binr/rahash2/Makefile
index db9ab267d2..d24f5ee363 100644
--- a/binr/rahash2/Makefile
+++ b/binr/rahash2/Makefile
@@ -11,3 +11,4 @@ endif
 include ../../libr/socket/deps.mk
 include ../../shlr/zip/deps.mk
 include ../../shlr/gdb/deps.mk
+include ../../shlr/bochs/deps.mk
diff --git a/libr/core/cmd_anal.c b/libr/core/cmd_anal.c
index e9f4b768f3..1a3197a177 100644
--- a/libr/core/cmd_anal.c
+++ b/libr/core/cmd_anal.c
@@ -2283,7 +2283,7 @@ static void cmd_anal_esil(RCore *core, const char *input) {
 	case 'x':{ // "aex"
 		ut32 new_bits = -1;
 		int segoff, old_bits, pos = 0;
-		ut8 settings_changed = false;
+		bool settings_changed = false;
 		char *new_arch = NULL, *old_arch = NULL, *hex = NULL;
 		old_arch = strdup (r_config_get (core->config, "asm.arch"));
 		old_bits = r_config_get_i (core->config, "asm.bits");
diff --git a/shlr/bochs/deps.mk b/shlr/bochs/deps.mk
index cc21ca650f..cc09f8a0bd 100644
--- a/shlr/bochs/deps.mk
+++ b/shlr/bochs/deps.mk
@@ -1 +1 @@
-LINK+=../../shlr/gdb/lib/libgdbr.a
+LINK+=../../shlr/bochs/lib/libbochs.a