diff --git a/cli/cli.zig b/cli/cli.zig
index 8171e78..3e9908a 100644
--- a/cli/cli.zig
+++ b/cli/cli.zig
@@ -51,7 +51,7 @@ pub fn main() !void {
 
     run(allocator, options, writer) catch |err| {
         switch (err) {
-            error.JetzigCommandError => std.os.exit(1),
+            error.JetzigCommandError => std.process.exit(1),
             else => return err,
         }
     };
diff --git a/cli/commands/bundle.zig b/cli/commands/bundle.zig
index 7435a7e..d9972a5 100644
--- a/cli/commands/bundle.zig
+++ b/cli/commands/bundle.zig
@@ -62,7 +62,7 @@ pub fn run(
         var install_argv = std.ArrayList([]const u8).init(allocator);
         defer install_argv.deinit();
 
-        try install_argv.appendSlice(&[_][]const u8{ "zig", "build" });
+        try install_argv.appendSlice(&[_][]const u8{ "zig", "build", "--color", "on" });
 
         switch (builtin.os.tag) {
             .windows => try tar_argv.appendSlice(&[_][]const u8{
@@ -134,6 +134,6 @@ pub fn run(
     } else {
         std.debug.print("Unable to locate compiled executable. Exiting.", .{});
         util.printFailure();
-        std.os.exit(1);
+        std.process.exit(1);
     }
 }
diff --git a/cli/commands/server.zig b/cli/commands/server.zig
index f38aca7..915677d 100644
--- a/cli/commands/server.zig
+++ b/cli/commands/server.zig
@@ -63,16 +63,20 @@ pub fn run(
     );
 
     while (true) {
-        try util.runCommand(
+        util.runCommand(
             allocator,
             realpath,
-            &[_][]const u8{ "zig", "build", "-Djetzig_runner=true", "install" },
-        );
+            &[_][]const u8{ "zig", "build", "-Djetzig_runner=true", "install", "--color", "on" },
+        ) catch {
+            std.debug.print("Build failed, waiting for file change...\n", .{});
+            try awaitFileChange(allocator, cwd, &mtime);
+            continue;
+        };
 
         const exe_path = try util.locateExecutable(allocator, cwd, .{});
         if (exe_path == null) {
             std.debug.print("Unable to locate compiled executable. Exiting.\n", .{});
-            std.os.exit(1);
+            std.process.exit(1);
         }
 
         const argv = &[_][]const u8{exe_path.?};
@@ -94,25 +98,25 @@ pub fn run(
 
         if (!options.reload) {
             const term = try process.wait();
-            std.os.exit(term.Exited);
+            std.process.exit(term.Exited);
         }
 
-        while (true) {
-            if (process.term) |_| {
-                _ = try process.wait();
-                std.debug.print("Server exited, restarting...\n", .{});
-            }
+        // HACK: This currenly doesn't restart the server when it exits, maybe that
+        // could be implemented in the future.
 
-            std.time.sleep(watch_changes_pause_duration);
+        awaitFileChange(allocator, cwd, mtime);
+        std.debug.print("Changes detected, restarting server...\n", .{});
+        _ = try process.kill();
+    }
+}
 
-            const new_mtime = try totalMtime(allocator, cwd, "src");
-
-            if (new_mtime > mtime) {
-                std.debug.print("Changes detected, restarting server...\n", .{});
-                _ = try process.kill();
-                mtime = new_mtime;
-                break;
-            }
+fn awaitFileChange(allocator: std.mem.Allocator, cwd: std.fs.Dir, mtime: *i128) !void {
+    while (true) {
+        std.time.sleep(watch_changes_pause_duration);
+        const new_mtime = try totalMtime(allocator, cwd, "src");
+        if (new_mtime > mtime.*) {
+            mtime.* = new_mtime;
+            return;
         }
     }
 }