diff --git a/src/mzscheme/gc2/newgc.c b/src/mzscheme/gc2/newgc.c
index 4b0ad4cb1d..d9cf19d016 100644
--- a/src/mzscheme/gc2/newgc.c
+++ b/src/mzscheme/gc2/newgc.c
@@ -707,8 +707,6 @@ long GC_initial_word(int sizeb)
   info.size = (sizeb >> gcLOG_WORD_SIZE);
   memcpy(&w, &info, sizeof(struct objhead));
 
-  ((struct objhead*)&w)->size = (sizeb >> gcLOG_WORD_SIZE);
-
   return w;
 }
 
diff --git a/src/mzscheme/src/unwind/libunwind.c b/src/mzscheme/src/unwind/libunwind.c
index 55a687bfcc..5cdc10b92f 100644
--- a/src/mzscheme/src/unwind/libunwind.c
+++ b/src/mzscheme/src/unwind/libunwind.c
@@ -1759,26 +1759,6 @@ apply:
   return 0;
 }
 
-/* The proc-info must be valid for IP before this routine can be
-   called.  */
-HIDDEN int
-dwarf_create_state_record (struct dwarf_cursor *c, dwarf_state_record_t *sr)
-{
-  return create_state_record_for (c, sr, c->ip);
-}
-
-HIDDEN int
-dwarf_make_proc_info (struct dwarf_cursor *c)
-{
-#if 0
-  if (c->as->caching_policy == UNW_CACHE_NONE
-      || get_cached_proc_info (c) < 0)
-#endif
-    /* Lookup it up the slow way... */
-    return fetch_proc_info (c, c->ip, 0);
-  return 0;
-}
-
 HIDDEN int
 dwarf_step (struct dwarf_cursor *c)
 {
@@ -2132,12 +2112,6 @@ dwarf_search_unwind_table (unw_addr_space_t as, unw_word_t ip,
   return 0;
 }
 
-void
-dwarf_put_unwind_info (unw_addr_space_t as, unw_proc_info_t *pi, void *arg)
-{
-  return;	/* always a nop */
-}
-
 /*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
 /*                                glue                                */
 /*XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX*/
@@ -2522,8 +2496,8 @@ void unw_manual_step(unw_cursor_t *_c,
   c->dwarf.loc[13].val = (unw_word_t)r13_addr;
   c->dwarf.loc[16].val = (unw_word_t)ip_addr;
 
-  c->dwarf.ip = *(unw_word_t *)safe_pointer(ip_addr);
-  c->dwarf.cfa = *(unw_word_t *)safe_pointer(sp_addr);
+  c->dwarf.ip = *(unw_word_t *)safe_pointer((unw_word_t)ip_addr);
+  c->dwarf.cfa = *(unw_word_t *)safe_pointer((unw_word_t)sp_addr);
   c->dwarf.ret_addr_column = RIP;
   c->dwarf.pi_valid = 0;
   c->dwarf.hint = 0;
diff --git a/src/mzscheme/src/unwind/libunwind_i.h b/src/mzscheme/src/unwind/libunwind_i.h
index 5457d6acc7..ee1cff6340 100644
--- a/src/mzscheme/src/unwind/libunwind_i.h
+++ b/src/mzscheme/src/unwind/libunwind_i.h
@@ -621,7 +621,6 @@ struct dwarf_rs_cache
 #define dwarf_read_encoded_pointer	UNW_OBJ (dwarf_read_encoded_pointer)
 #define dwarf_step			UNW_OBJ (dwarf_step)
 
-HIDDEN int dwarf_init (void);
 HIDDEN int dwarf_find_proc_info (unw_addr_space_t as, unw_word_t ip,
 				 unw_proc_info_t *pi,
 				 int need_unwind_info, void *arg);
@@ -630,8 +629,6 @@ HIDDEN int dwarf_search_unwind_table (unw_addr_space_t as,
 				      unw_dyn_info_t *di,
 				      unw_proc_info_t *pi,
 				      int need_unwind_info, void *arg);
-HIDDEN void dwarf_put_unwind_info (unw_addr_space_t as,
-				   unw_proc_info_t *pi, void *arg);
 HIDDEN int dwarf_eval_expr (struct dwarf_cursor *c, unw_word_t *addr,
 			    unw_word_t len, unw_word_t *valp,
 			    int *is_register);
@@ -642,9 +639,6 @@ HIDDEN int dwarf_extract_proc_info_from_fde (unw_addr_space_t as,
 					     int need_unwind_info,
 					     void *arg);
 HIDDEN int dwarf_find_save_locs (struct dwarf_cursor *c);
-HIDDEN int dwarf_create_state_record (struct dwarf_cursor *c,
-				      dwarf_state_record_t *sr);
-HIDDEN int dwarf_make_proc_info (struct dwarf_cursor *c);
 HIDDEN int dwarf_read_encoded_pointer (unw_addr_space_t as,
 				       unw_accessors_t *a,
 				       unw_word_t *addr,