diff --git a/src/runner.zig b/src/runner.zig
index db40493..a1bed65 100644
--- a/src/runner.zig
+++ b/src/runner.zig
@@ -234,14 +234,14 @@ pub const Runner = struct {
         defer params.deinit();
 
         inline for (@typeInfo(@TypeOf(command.parameters)).Struct.fields) |cmd_field| {
-            _ = try params.put(
+            try params.put(
                 cmd_field.name,
                 @field(command.parameters, cmd_field.name),
             );
         }
 
         var image = try self.getImage();
-        try image.runCustomPlugin(@TypeOf(command).plugin_type, pos, &params);
+        try image.runCustomPlugin(typ.plugin_type, pos, map);
     }
 
     fn newRunCommandSingle(
@@ -261,7 +261,7 @@ pub const Runner = struct {
             const ctype = typ.command_type;
             switch (ctype) {
                 .lv2_command => try self.executeLV2Command(command.*),
-                .custom_command => try self.executePlugin(command.*),
+                .plugin_command => try self.executePlugin(command.*),
                 else => @panic("TODO support command type"),
             }
         }
@@ -306,10 +306,7 @@ pub const Runner = struct {
             .saturator => try self.newRunCommandSingle(cmd, .saturator),
             .vintagedelay => try self.newRunCommandSingle(cmd, .vintagedelay),
 
-            .noise => try self.newRunCommandSingle(cmd, .noise),
-            .wildnoise => try self.newRunCommandSingle(cmd, .wildnoise),
-            .write => try self.newRunCommandSingle(cmd, .write),
-            .embed => try self.newRunCommandSingle(cmd, .embed),
+            .noise, .wildnoise, .write, .embed => |tag| try self.newRunCommandSingle(cmd, tag),
 
             else => {
                 std.debug.warn("TODO support {}\n", .{@tagName(cmd.tag)});