diff --git a/racket/src/racket/cmdline.inc b/racket/src/racket/cmdline.inc
index 5682296102..0d6156390d 100644
--- a/racket/src/racket/cmdline.inc
+++ b/racket/src/racket/cmdline.inc
@@ -661,8 +661,10 @@ static Scheme_Object *get_log_level(char *prog, char *real_switch, const char *e
     } else if (!strncmp(str, "debug", 5)) {
       k  = SCHEME_LOG_DEBUG;
       len = 5;
-    } else 
+    } else {
       k = -1;
+      len = 0;
+    }
 
     str += len;
 
diff --git a/racket/src/racket/src/fun.c b/racket/src/racket/src/fun.c
index 0f46ac27f6..690064010a 100644
--- a/racket/src/racket/src/fun.c
+++ b/racket/src/racket/src/fun.c
@@ -7923,8 +7923,6 @@ scheme_extract_one_cc_mark_with_meta(Scheme_Object *mark_set, Scheme_Object *key
         bottom = 0;
       } else {
         startpos = (intptr_t)MZ_CONT_MARK_STACK;
-        if (!p->cont_mark_stack_segments)
-          findpos = 0;
         bottom = p->cont_mark_stack_bottom;
       }
 
@@ -8093,11 +8091,9 @@ extract_one_cc_mark_fast(Scheme_Object *key)
   Scheme_Thread *p = scheme_current_thread;
 
   startpos = (intptr_t)MZ_CONT_MARK_STACK;
-  if (!p->cont_mark_stack_segments)
-    findpos = 0;
-
+ 
   bottom = p->cont_mark_stack_bottom;
-  minbottom = findpos - 32;
+  minbottom = startpos - 32;
   if (bottom < minbottom) 
     bottom = minbottom;
   
diff --git a/racket/src/racket/src/jitcall.c b/racket/src/racket/src/jitcall.c
index 96123984d5..a6395c0809 100644
--- a/racket/src/racket/src/jitcall.c
+++ b/racket/src/racket/src/jitcall.c
@@ -667,7 +667,7 @@ static int generate_retry_call(mz_jit_state *jitter, int num_rands, int multi_ok
   
   /* Slow path; restore R0 to SCHEME_TAIL_CALL_WAITING */
   mz_patch_branch(ref);
-  jit_movi_p(JIT_R0, SCHEME_TAIL_CALL_WAITING);
+  (void)jit_movi_p(JIT_R0, SCHEME_TAIL_CALL_WAITING);
 
   return 1;
 }
diff --git a/racket/src/racket/src/struct.c b/racket/src/racket/src/struct.c
index 473140c1d3..3f0476b1da 100644
--- a/racket/src/racket/src/struct.c
+++ b/racket/src/racket/src/struct.c
@@ -5447,9 +5447,10 @@ static Scheme_Object *do_chaperone_struct(const char *name, int is_impersonator,
                               "operation procedure", 1, a[0],
                               NULL);
 
-      if (!scheme_struct_type_property_ref(prop, argv[0]))
+      if (!scheme_struct_type_property_ref(prop, argv[0])) {
         non_applicable_op = 1;
-      else {
+        arity = 0;
+      } else {
         if (!red_props)
           red_props = scheme_make_hash_tree(0);