diff --git a/src/main.zig b/src/main.zig
index 66f5c48..275ea18 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -133,7 +133,7 @@ pub fn addEmbeddedExecutable(
     // - Generate the linker scripts from the "chip" or "board" package instead of using hardcoded ones.
     //   - This requires building another tool that runs on the host that compiles those files and emits the linker script.
     //    - src/tools/linkerscript-gen.zig is the source file for this
-    exe.bundle_compiler_rt = false;
+    exe.bundle_compiler_rt = true;
     switch (backing) {
         .chip => {
             var app_pkgs = std.ArrayList(Pkg).init(builder.allocator);
diff --git a/src/modules/cpus.zig b/src/modules/cpus.zig
index 7fd8f30..95f37e4 100644
--- a/src/modules/cpus.zig
+++ b/src/modules/cpus.zig
@@ -22,7 +22,7 @@ pub const cortex_m3 = Cpu{
     .name = "ARM Cortex-M3",
     .path = root_path ++ "cpus/cortex-m/cortex-m.zig",
     .target = std.zig.CrossTarget{
-        .cpu_arch = .arm,
+        .cpu_arch = .thumb,
         .cpu_model = .{ .explicit = &std.Target.arm.cpu.cortex_m3 },
         .os_tag = .freestanding,
         .abi = .none,