diff --git a/eeschema/sim/simulator_frame_ui.cpp b/eeschema/sim/simulator_frame_ui.cpp
index 127a6ab801..a1d50551c3 100644
--- a/eeschema/sim/simulator_frame_ui.cpp
+++ b/eeschema/sim/simulator_frame_ui.cpp
@@ -1632,7 +1632,7 @@ void SIMULATOR_FRAME_UI::AddTuner( const SCH_SHEET_PATH& aSheetPath, SCH_SYMBOL*
             return;
     }
 
-    if( const SPICE_ITEM* item = GetExporter()->FindItem( ref ) )
+    if( [[maybe_unused]] const SPICE_ITEM* item = GetExporter()->FindItem( ref ) )
     {
         try
         {
diff --git a/gerbview/gerber_draw_item.cpp b/gerbview/gerber_draw_item.cpp
index 964aaf255c..590a317307 100644
--- a/gerbview/gerber_draw_item.cpp
+++ b/gerbview/gerber_draw_item.cpp
@@ -253,7 +253,7 @@ wxString GERBER_DRAW_ITEM::ShowGBRShape() const
 
 D_CODE* GERBER_DRAW_ITEM::GetDcodeDescr() const
 {
-    if( ( m_DCode < FIRST_DCODE ) || ( m_DCode > LAST_DCODE ) )
+    if( !D_CODE::IsValidDcodeValue( m_DCode ) )
         return nullptr;
 
     if( m_GerberImageFile == nullptr )