diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index e57b914c8e..031ebacc7b 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -47,10 +47,16 @@ ifeq ($(CONFIG_SIM_M32),y)
 else
   ASRCS += up_setjmp64.S
 endif
-else
+endif
+
+ifeq ($(CONFIG_HOST_X86_64),y)
   ASRCS += up_setjmp32.S
 endif
 
+ifeq ($(CONFIG_HOST_ARM),y)
+  ASRCS += up_setjmp_arm.S
+endif
+
 AOBJS = $(ASRCS:.S=$(OBJEXT))
 
 CSRCS  = up_initialize.c up_idle.c up_interruptcontext.c up_initialstate.c
diff --git a/net/sixlowpan/sixlowpan_reassbuf.c b/net/sixlowpan/sixlowpan_reassbuf.c
index fcce43dd8c..514da1f110 100644
--- a/net/sixlowpan/sixlowpan_reassbuf.c
+++ b/net/sixlowpan/sixlowpan_reassbuf.c
@@ -108,7 +108,7 @@ static bool sixlowpan_compare_fragsrc(FAR struct sixlowpan_reassbuf_s *reass,
 
   if (fragsrc->nv_addrlen == reass->rb_fragsrc.nv_addrlen)
     {
-      /* The are the same sizer, return the address comparisson */
+      /* The are the same size, return the address comparisson */
 
       return (memcmp(fragsrc->nv_addr, reass->rb_fragsrc.nv_addr,
                      fragsrc->nv_addrlen) == 0);