diff --git a/mk/target.mk b/mk/target.mk
index 64d6e30cdd0..45351798711 100644
--- a/mk/target.mk
+++ b/mk/target.mk
@@ -7,7 +7,7 @@
 # If you are making non-backwards compatible changes to the runtime,
 # set this flag to 1.  It will cause stage1 to use the snapshot
 # runtime rather than the runtime from the working directory.
-USE_SNAPSHOT_RUNTIME=1
+USE_SNAPSHOT_RUNTIME=0
 
 define TARGET_STAGE_N
 
diff --git a/src/rt/rust_shape.h b/src/rt/rust_shape.h
index 3cbb4033516..848e304df30 100644
--- a/src/rt/rust_shape.h
+++ b/src/rt/rust_shape.h
@@ -26,8 +26,8 @@
 
 namespace shape {
 
-typedef unsigned tag_variant_t;
-typedef unsigned tag_align_t;
+typedef unsigned long tag_variant_t;
+typedef unsigned long tag_align_t;
 typedef unsigned long ref_cnt_t;
 
 // Constants