diff --git a/build.zig b/build.zig
index aae4972bb..fa16e9299 100644
--- a/build.zig
+++ b/build.zig
@@ -170,7 +170,7 @@ fn conformanceSteps(
     var map = std.StringHashMap(*LibExeObjStep).init(b.allocator);
 
     // Open the directory ./conformance
-    const c_dir_path = root() ++ "/conformance";
+    const c_dir_path = (comptime root()) ++ "/conformance";
     var c_dir = try fs.openIterableDirAbsolute(c_dir_path, .{});
     defer c_dir.close();
 
diff --git a/src/Command.zig b/src/Command.zig
index 53826a64d..71b929d0c 100644
--- a/src/Command.zig
+++ b/src/Command.zig
@@ -32,6 +32,8 @@ const Allocator = std.mem.Allocator;
 const File = std.fs.File;
 const EnvMap = std.process.EnvMap;
 
+const PreExecFn = fn (*Command) void;
+
 /// Path to the command to run. This must be an absolute path. This
 /// library does not do PATH lookup.
 path: []const u8,
@@ -55,7 +57,10 @@ stderr: ?File = null,
 /// If set, this will be executed /in the child process/ after fork but
 /// before exec. This is useful to setup some state in the child before the
 /// exec process takes over, such as signal handlers, setsid, setuid, etc.
-pre_exec: ?fn (*Command) void = null,
+pre_exec: switch (builtin.zig_backend) {
+    .stage1 => ?PreExecFn,
+    else => ?*const PreExecFn,
+} = null,
 
 /// User data that is sent to the callback. Set with setData and getData
 /// for a more user-friendly API.
diff --git a/src/Grid.zig b/src/Grid.zig
index 91109c3bc..5c517a748 100644
--- a/src/Grid.zig
+++ b/src/Grid.zig
@@ -587,5 +587,5 @@ test "GridSize update rounding" {
     try testing.expectEqual(@as(GridSize.Unit, 2), grid.rows);
 }
 
-const face_ttf = @embedFile("../fonts/FiraCode-Regular.ttf");
-const face_bold_ttf = @embedFile("../fonts/FiraCode-Bold.ttf");
+const face_ttf = @embedFile("font/res/FiraCode-Regular.ttf");
+const face_bold_ttf = @embedFile("font/res/FiraCode-Bold.ttf");
diff --git a/src/font/Face.zig b/src/font/Face.zig
index 1f370c492..df49e6145 100644
--- a/src/font/Face.zig
+++ b/src/font/Face.zig
@@ -161,4 +161,4 @@ test {
     }
 }
 
-const testFont = @embedFile("../../fonts/Inconsolata-Regular.ttf");
+const testFont = @embedFile("res/Inconsolata-Regular.ttf");
diff --git a/fonts/FiraCode-Bold.ttf b/src/font/res/FiraCode-Bold.ttf
similarity index 100%
rename from fonts/FiraCode-Bold.ttf
rename to src/font/res/FiraCode-Bold.ttf
diff --git a/fonts/FiraCode-Regular.ttf b/src/font/res/FiraCode-Regular.ttf
similarity index 100%
rename from fonts/FiraCode-Regular.ttf
rename to src/font/res/FiraCode-Regular.ttf
diff --git a/fonts/Inconsolata-Bold.ttf b/src/font/res/Inconsolata-Bold.ttf
similarity index 100%
rename from fonts/Inconsolata-Bold.ttf
rename to src/font/res/Inconsolata-Bold.ttf
diff --git a/fonts/Inconsolata-Regular.ttf b/src/font/res/Inconsolata-Regular.ttf
similarity index 100%
rename from fonts/Inconsolata-Regular.ttf
rename to src/font/res/Inconsolata-Regular.ttf
diff --git a/fonts/Inconsolata.ttf b/src/font/res/Inconsolata.ttf
similarity index 100%
rename from fonts/Inconsolata.ttf
rename to src/font/res/Inconsolata.ttf
diff --git a/src/font/test.zig b/src/font/test.zig
index d8b419a54..660d5f5ec 100644
--- a/src/font/test.zig
+++ b/src/font/test.zig
@@ -1,2 +1,2 @@
-pub const fontRegular = @embedFile("../../fonts/Inconsolata-Regular.ttf");
-pub const fontBold = @embedFile("../../fonts/Inconsolata-Bold.ttf");
+pub const fontRegular = @embedFile("res/Inconsolata-Regular.ttf");
+pub const fontBold = @embedFile("res/Inconsolata-Bold.ttf");
diff --git a/src/terminal/osc.zig b/src/terminal/osc.zig
index 40ff85caf..217770a43 100644
--- a/src/terminal/osc.zig
+++ b/src/terminal/osc.zig
@@ -210,13 +210,13 @@ pub const Parser = struct {
 
                 'B' => {
                     self.state = .semantic_option_start;
-                    self.command = .{ .prompt_end = .{} };
+                    self.command = .{ .prompt_end = {} };
                     self.complete = true;
                 },
 
                 'C' => {
                     self.state = .semantic_option_start;
-                    self.command = .{ .end_of_input = .{} };
+                    self.command = .{ .end_of_input = {} };
                     self.complete = true;
                 },