diff --git a/build.zig b/build.zig
index 7a9bfe7..eceae5b 100644
--- a/build.zig
+++ b/build.zig
@@ -46,11 +46,14 @@ pub fn build(b: *std.Build) void {
     });
     server.root_module.strip = true;
 
-    const ztracy = b.dependency("ztracy", .{
-        .enable_ztracy = true,
-        .enable_fibers = false,
-        .on_demand = false,
-    });
+    const ztracy = b.dependency(
+        "ztracy",
+        .{
+            .enable_ztracy = true,
+            .enable_fibers = false,
+            .on_demand = false,
+        }
+    );
     client.root_module.addImport("ztracy", ztracy.module("root"));
     client.linkLibrary(ztracy.artifact("tracy"));
 
@@ -88,26 +91,33 @@ pub fn build(b: *std.Build) void {
     });
     client.root_module.addImport("stb_rect_pack", stb_rect_pack.createModule());
 
-    const zmath = b.dependency("zmath", .{});
+    const zmath = b.dependency(
+        "zmath",
+        .{
+            .target = target,
+            .optimize = optimize,
+        }
+    );
     client.root_module.addImport("zmath", zmath.module("root"));
     server.root_module.addImport("zmath", zmath.module("root"));
     shared.addImport("zmath", zmath.module("root"));
 
-    const znet_dep = b.dependency(
+    const znet = b.dependency(
         "znet",
         .{
             .target = target,
             .optimize = optimize,
         }
     );
-    const znet_mod = znet_dep.module("znet");
-    // const znet_artifact = znet_dep.artifact("znet");
-    client.root_module.addImport("znet", znet_mod);
-    // client.linkLibrary(znet_artifact);
-    server.root_module.addImport("znet", znet_mod);
-    // server.linkLibrary(znet_artifact);
+    client.root_module.addImport("znet", znet.module("znet"));
+    server.root_module.addImport("znet", znet.module("znet"));
 
-    const bufzilla = b.dependency("bufzilla", .{});
+    const bufzilla = b.dependency(
+    "bufzilla",
+    .{
+        .target = target,
+        .optimize = optimize,
+    });
     client.root_module.addImport("bufzilla", bufzilla.module("bufzilla"));
     server.root_module.addImport("bufzilla", bufzilla.module("bufzilla"));
 
@@ -125,11 +135,6 @@ pub fn build(b: *std.Build) void {
     client.root_module.addImport("raylib", raylib);
     client.root_module.addImport("raygui", raygui);
 
-    // const raylib_dep = b.dependency("raylib", .{ .target = target, .optimize = optimize });
-    // const raylib = raylib_dep.artifact("raylib");
-    // raylib.root_module.addCMacro("SUPPORT_CUSTOM_FRAME_CONTROL", "");
-    // client.linkLibrary(raylib);
-
     b.installArtifact(client);
     b.installArtifact(server);