diff --git a/eeschema/dialogs/dialog_pin_properties.h b/eeschema/dialogs/dialog_pin_properties.h
index a00a7db13a..14cf7dc88b 100644
--- a/eeschema/dialogs/dialog_pin_properties.h
+++ b/eeschema/dialogs/dialog_pin_properties.h
@@ -76,7 +76,7 @@ private:
     LIB_PIN*            m_pin;
 
     LIB_SYMBOL*         m_dummyParent;
-    LIB_PIN*            m_dummyPin;       // a working copy used to show changes
+    LIB_PIN*            m_dummyPin;                   // a working copy used to show changes
 
     UNIT_BINDER         m_posX;
     UNIT_BINDER         m_posY;
@@ -91,7 +91,7 @@ private:
     int                 m_delayedFocusRow;
     int                 m_delayedFocusColumn;
 
-    int                 m_originalColWidths[ COL_COUNT ];
+    std::map<int, int>  m_originalColWidths;          // map col-number : orig-col-width
     wxSize              m_size;
     bool                m_initialized;
     inline static bool  s_alternatesTurndownOpen = false;
diff --git a/include/dialogs/panel_setup_netclasses.h b/include/dialogs/panel_setup_netclasses.h
index 36b23c0c28..b3d33f146a 100644
--- a/include/dialogs/panel_setup_netclasses.h
+++ b/include/dialogs/panel_setup_netclasses.h
@@ -83,7 +83,7 @@ private:
     std::map<wxString, std::shared_ptr<NETCLASS>> m_lastLoaded;
     int                                           m_lastCheckedTicker;
 
-    std::vector<int>      m_originalColWidths;
+    std::map<int, int>    m_originalColWidths;  // Map col-number : orig-col-width
     bool                  m_netclassesDirty;    // The netclass drop-down menus need rebuilding
     int                   m_hoveredCol;         // Column being hovered over, for tooltips
     wxString              m_lastPattern;