diff --git a/build.zig b/build.zig
index b448ef7..841fe77 100644
--- a/build.zig
+++ b/build.zig
@@ -59,6 +59,7 @@ pub fn build(b: *std.Build) void {
             .name = b.fmt("vulkan_{s}", .{impl.name}),
             .root_module = lib_mod,
             .linkage = .dynamic,
+            .use_llvm = true, // Fixes some random bugs happenning with custom backend. Investigations needed
         });
         const lib_install = b.addInstallArtifact(lib, .{});
 
diff --git a/src/soft/SoftPhysicalDevice.zig b/src/soft/SoftPhysicalDevice.zig
index 3986197..fd6a09a 100644
--- a/src/soft/SoftPhysicalDevice.zig
+++ b/src/soft/SoftPhysicalDevice.zig
@@ -77,6 +77,7 @@ pub fn create(allocator: std.mem.Allocator, instance: *const base.Instance) VkEr
     };
     interface.queue_family_props = std.ArrayList(vk.QueueFamilyProperties).fromOwnedSlice(queue_family_props[0..]);
 
+    // TODO: use Pytorch's cpuinfo someday
     const info = cpuinfo.get(allocator) catch return VkError.InitializationFailed;
     defer info.deinit(allocator);