diff --git a/src/wrapper/clap/factory.rs b/src/wrapper/clap/factory.rs
index e44f989a..c5f1938e 100644
--- a/src/wrapper/clap/factory.rs
+++ b/src/wrapper/clap/factory.rs
@@ -60,7 +60,7 @@ impl<P: ClapPlugin> Factory<P> {
 
         if !plugin_id.is_null() && CStr::from_ptr(plugin_id) == factory.plugin_descriptor.clap_id()
         {
-            &Box::leak(Box::new(Wrapper::<P>::new(host))).clap_plugin
+            &Box::leak(Wrapper::<P>::new(host)).clap_plugin
         } else {
             ptr::null()
         }
diff --git a/src/wrapper/clap/plugin.rs b/src/wrapper/clap/plugin.rs
index f0d60db7..2e8c5103 100644
--- a/src/wrapper/clap/plugin.rs
+++ b/src/wrapper/clap/plugin.rs
@@ -105,7 +105,7 @@ pub struct Wrapper<P: ClapPlugin> {
     /// and output channel counts if that does not match one of those configurations (to do the
     /// least surprising thing).
     ///
-    /// TODO: Support surround setups once a plugin needs taht
+    /// TODO: Support surround setups once a plugin needs that
     supported_bus_configs: Vec<BusConfig>,
 
     clap_plugin_audio_ports: clap_plugin_audio_ports,
@@ -214,7 +214,7 @@ impl<P: ClapPlugin> MainThreadExecutor<Task> for Wrapper<P> {
 }
 
 impl<P: ClapPlugin> Wrapper<P> {
-    pub fn new(host_callback: *const clap_host) -> Self {
+    pub fn new(host_callback: *const clap_host) -> Box<Self> {
         let plugin_descriptor = Box::new(PluginDescriptor::default());
 
         assert!(!host_callback.is_null());
@@ -371,7 +371,7 @@ impl<P: ClapPlugin> Wrapper<P> {
             .map(|(_, hash, ptr)| (*ptr, hash))
             .collect();
 
-        wrapper
+        Box::new(wrapper)
     }
 
     fn make_process_context(&self) -> WrapperProcessContext<'_, P> {