diff --git a/include/wx_fstream_progress.h b/include/wx_fstream_progress.h
index d2f8e681d9..e317f4659a 100644
--- a/include/wx_fstream_progress.h
+++ b/include/wx_fstream_progress.h
@@ -48,7 +48,7 @@ public:
 
     void SetProgressCallback( std::function<void( size_t )> aCallback )
     {
-        m_callback = aCallback;
+        m_callback = std::move( aCallback );
     }
 
     virtual size_t OnSysWrite( const void* aBuffer, size_t aSize ) override
diff --git a/pcbnew/plugins/ipc2581/ipc2581_plugin.h b/pcbnew/plugins/ipc2581/ipc2581_plugin.h
index 67b917b153..399056a3a9 100644
--- a/pcbnew/plugins/ipc2581/ipc2581_plugin.h
+++ b/pcbnew/plugins/ipc2581/ipc2581_plugin.h
@@ -51,7 +51,25 @@ public:
      * @brief IPC2581_PLUGIN
      *
     */
-    IPC2581_PLUGIN(){}
+    IPC2581_PLUGIN()
+    {
+        m_show_layer_mapping_warnings = false;
+        m_total_bytes = 0;
+        m_scale = 1.0;
+        m_sigfig = 3;
+        m_version = 'B';
+        m_enterpriseNode = nullptr;
+        m_board = nullptr;
+        m_props = nullptr;
+        m_shape_user_node = nullptr;
+        m_shape_std_node = nullptr;
+        m_line_node = nullptr;
+        m_last_padstack = nullptr;
+        m_progress_reporter = nullptr;
+        m_xml_doc = nullptr;
+        m_xml_root = nullptr;
+    }
+
     ~IPC2581_PLUGIN() override;
 
     /**