diff --git a/libr/core/cmd_debug.c b/libr/core/cmd_debug.c
index 1bf9842723..78fa61b5fb 100644
--- a/libr/core/cmd_debug.c
+++ b/libr/core/cmd_debug.c
@@ -1423,7 +1423,7 @@ static int cmd_debug_map(RCore *core, const char *input) {
 				ptr = strdup (r_str_trim_head ((char*)input + 2));
 				if (!ptr || !*ptr) {
 					r_core_cmd (core, "dmm", 0);
-					return;
+					break;
 				}
 				i = r_str_word_set0 (ptr);
 				switch (i) {
diff --git a/libr/core/linux_heap_jemalloc.c b/libr/core/linux_heap_jemalloc.c
index d13818f291..ac0fad3d98 100644
--- a/libr/core/linux_heap_jemalloc.c
+++ b/libr/core/linux_heap_jemalloc.c
@@ -86,7 +86,7 @@ static bool GH(r_resolve_jemalloc)(RCore *core, char *symname, ut64 *symbol) {
 	}
 	char *path = r_str_newf ("%s", jemalloc_ver_end);
 	if (r_file_exists (path)) {
-		vaddr = GH(je_get_va_symbol)(path, symname);
+		ut64 vaddr = GH(je_get_va_symbol)(path, symname);
 		if (jemalloc_addr != GHT_MAX && vaddr != 0) {
 			*symbol = jemalloc_addr + vaddr;
 			free (path);