diff --git a/gpu/src/Buffer.zig b/gpu/src/Buffer.zig
index 54f0778d..691351ce 100644
--- a/gpu/src/Buffer.zig
+++ b/gpu/src/Buffer.zig
@@ -37,12 +37,14 @@ pub inline fn destroy(buf: Buffer) void {
 }
 
 pub inline fn getConstMappedRange(buf: Buffer, comptime T: type, offset: usize, len: usize) []const T {
-    const data = buf.vtable.getConstMappedRange(buf.ptr, offset, @sizeOf(T) * len);
-    return @ptrCast([*]const T, data.ptr)[0..len];
+    const size = @sizeOf(T) * len;
+    const data = buf.vtable.getConstMappedRange(buf.ptr, offset, size + size % 4);
+    return @ptrCast([*]const T, @alignCast(@alignOf(T), data.ptr))[0..len];
 }
 
 pub inline fn getMappedRange(buf: Buffer, comptime T: type, offset: usize, len: usize) []T {
-    const data = buf.vtable.getMappedRange(buf.ptr, offset, @sizeOf(T) * len);
+    const size = @sizeOf(T) * len;
+    const data = buf.vtable.getMappedRange(buf.ptr, offset, size + size % 4);
     return @ptrCast([*]T, @alignCast(@alignOf(T), data.ptr))[0..len];
 }
 
diff --git a/gpu/src/Device.zig b/gpu/src/Device.zig
index a8dd9378..0efd205a 100644
--- a/gpu/src/Device.zig
+++ b/gpu/src/Device.zig
@@ -177,7 +177,9 @@ pub inline fn destroy(device: Device) void {
 }
 
 pub inline fn createBuffer(device: Device, descriptor: *const Buffer.Descriptor) Buffer {
-    return device.vtable.createBuffer(device.ptr, descriptor);
+    var local_descriptor = descriptor.*;
+    local_descriptor.size += local_descriptor.size % 4;
+    return device.vtable.createBuffer(device.ptr, &local_descriptor);
 }
 
 pub inline fn createCommandEncoder(device: Device, descriptor: ?*const CommandEncoder.Descriptor) CommandEncoder {