diff --git a/libs/gpu/src/buffer.zig b/libs/gpu/src/buffer.zig
index 705ec6bf..2b08ce1c 100644
--- a/libs/gpu/src/buffer.zig
+++ b/libs/gpu/src/buffer.zig
@@ -102,7 +102,7 @@ pub const Buffer = opaque {
             offset_bytes,
             size + size % 4,
         );
-        return if (data) |d| @as([*]const T, @ptrCast(@alignCast(@alignOf(T), d)))[0..len] else null;
+        return if (data) |d| @as([*]const T, @ptrCast(@alignCast(d)))[0..len] else null;
     }
 
     /// Default `offset_bytes`: 0
@@ -119,7 +119,7 @@ pub const Buffer = opaque {
             offset_bytes,
             size + size % 4,
         );
-        return if (data) |d| @as([*]T, @ptrCast(@alignCast(@alignOf(T), d)))[0..len] else null;
+        return if (data) |d| @as([*]T, @ptrCast(@alignCast(d)))[0..len] else null;
     }
 
     pub inline fn getSize(buffer: *Buffer) u64 {
@@ -141,7 +141,7 @@ pub const Buffer = opaque {
         const Context = @TypeOf(context);
         const Helper = struct {
             pub fn cCallback(status: MapAsyncStatus, userdata: ?*anyopaque) callconv(.C) void {
-                callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), status);
+                callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), status);
             }
         };
         Impl.bufferMapAsync(buffer, mode, offset, size, Helper.cCallback, if (Context == void) null else context);
diff --git a/libs/gpu/src/device.zig b/libs/gpu/src/device.zig
index 7d7b4eb7..d8495da9 100644
--- a/libs/gpu/src/device.zig
+++ b/libs/gpu/src/device.zig
@@ -120,11 +120,7 @@ pub const Device = opaque {
                     status,
                     compute_pipeline,
                     message,
-<<<<<<< Updated upstream
-                    if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(Context), userdata))),
-=======
                     if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))),
->>>>>>> Stashed changes
                 );
             }
         };
@@ -275,7 +271,7 @@ pub const Device = opaque {
         const Context = @TypeOf(context);
         const Helper = struct {
             pub fn cCallback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
-                callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), typ, message);
+                callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), typ, message);
             }
         };
         Impl.devicePopErrorScope(device, Helper.cCallback, if (Context == void) null else context);
@@ -294,7 +290,7 @@ pub const Device = opaque {
             const Context = @TypeOf(context);
             const Helper = struct {
                 pub fn cCallback(reason: LostReason, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
-                    cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), reason, message);
+                    cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), reason, message);
                 }
             };
             Impl.deviceSetDeviceLostCallback(device, Helper.cCallback, if (Context == void) null else context);
@@ -316,7 +312,7 @@ pub const Device = opaque {
             const Context = @TypeOf(context);
             const Helper = struct {
                 pub fn cCallback(typ: LoggingType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
-                    cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), typ, message);
+                    cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), typ, message);
                 }
             };
             Impl.deviceSetLoggingCallback(device, Helper.cCallback, if (Context == void) null else context);
@@ -334,7 +330,7 @@ pub const Device = opaque {
             const Context = @TypeOf(context);
             const Helper = struct {
                 pub fn cCallback(typ: ErrorType, message: [*:0]const u8, userdata: ?*anyopaque) callconv(.C) void {
-                    cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), typ, message);
+                    cb(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), typ, message);
                 }
             };
             Impl.deviceSetUncapturedErrorCallback(device, Helper.cCallback, if (Context == void) null else context);
diff --git a/libs/gpu/src/queue.zig b/libs/gpu/src/queue.zig
index 5bf45f9e..18f2921c 100644
--- a/libs/gpu/src/queue.zig
+++ b/libs/gpu/src/queue.zig
@@ -45,7 +45,7 @@ pub const Queue = opaque {
         const Context = @TypeOf(context);
         const Helper = struct {
             pub fn cCallback(status: WorkDoneStatus, userdata: ?*anyopaque) callconv(.C) void {
-                callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(@alignOf(std.meta.Child(Context)), userdata))), status);
+                callback(if (Context == void) {} else @as(Context, @ptrCast(@alignCast(userdata))), status);
             }
         };
         Impl.queueOnSubmittedWorkDone(queue, signal_value, Helper.cCallback, if (Context == void) null else context);