diff --git a/py/objcode.h b/py/objcode.h
index 8db9a34b6e..aacbe17017 100644
--- a/py/objcode.h
+++ b/py/objcode.h
@@ -72,7 +72,7 @@ static inline const void *mp_code_get_proto_fun(mp_obj_code_t *self) {
 
 #include "py/emitglue.h"
 
-#define MP_CODE_QSTR_MAP(context, idx) (context->constants.qstr_table[idx])
+#define MP_CODE_QSTR_MAP(context, idx) (qstr)(context->constants.qstr_table[idx])
 
 typedef struct _mp_obj_code_t {
     // TODO this was 4 words
diff --git a/py/profile.c b/py/profile.c
index 397d0291f9..b5a0c54728 100644
--- a/py/profile.c
+++ b/py/profile.c
@@ -80,7 +80,7 @@ static void frame_print(const mp_print_t *print, mp_obj_t o_in, mp_print_kind_t
         "<frame at 0x%p, file '%q', line %d, code %q>",
         frame,
         MP_CODE_QSTR_MAP(code->context, 0),
-        frame->lineno,
+        (int)frame->lineno,
         MP_CODE_QSTR_MAP(code->context, prelude->qstr_block_name_idx)
         );
 }