diff --git a/src/stockdialog.h b/src/stockdialog.h
index cd4248c178..a9fca904e7 100644
--- a/src/stockdialog.h
+++ b/src/stockdialog.h
@@ -86,9 +86,10 @@ class mmStockDialog : public wxDialog
     wxListCtrl* m_price_listbox = nullptr;
 
     Model_Stock::Data* m_stock = nullptr;
-    bool m_edit;
-    int m_account_id;
     mmGUIFrame* m_gui_frame = nullptr;
+    bool m_edit = false;
+    int m_account_id = 0;
+
     enum
     {
         ID_DPC_STOCK_PDATE = wxID_HIGHEST + 800,
diff --git a/src/themes.cpp b/src/themes.cpp
index 08bd3fa63f..f06dc7666b 100755
--- a/src/themes.cpp
+++ b/src/themes.cpp
@@ -52,7 +52,7 @@ bool mmThemesDialog::vfsThemeImageLoaded = false;
 mmThemesDialog::ThemeEntry mmThemesDialog::getThemeEntry(const wxString& name)
 {
     ThemeEntry thisTheme;
-    for (const auto theme : m_themes)
+    for (const auto &theme : m_themes)
     {
         if (theme.name == name)
         {
diff --git a/src/transactionsupdatedialog.cpp b/src/transactionsupdatedialog.cpp
index 00f7de6a12..79f9a39aee 100644
--- a/src/transactionsupdatedialog.cpp
+++ b/src/transactionsupdatedialog.cpp
@@ -80,7 +80,7 @@ transactionsUpdateDialog::transactionsUpdateDialog(wxWindow* parent
             m_hasNonTransfers = true;
     }
 
-    m_custom_fields = new mmCustomDataTransaction(this, NULL, ID_CUSTOMFIELDS);
+    m_custom_fields = new mmCustomDataTransaction(this, 0, ID_CUSTOMFIELDS);
 
     this->SetFont(parent->GetFont());
     Create(parent);
@@ -529,7 +529,7 @@ void transactionsUpdateDialog::SetPayeeTransferControls()
     }
 }
 
-void transactionsUpdateDialog::OnTransTypeChanged(wxCommandEvent& event)
+void transactionsUpdateDialog::OnTransTypeChanged([[maybe_unused]] wxCommandEvent& event)
 {
     SetPayeeTransferControls();
 }