diff --git a/eeschema/sim/sim_model.cpp b/eeschema/sim/sim_model.cpp
index 7790491d9a..d1f4300ab3 100644
--- a/eeschema/sim/sim_model.cpp
+++ b/eeschema/sim/sim_model.cpp
@@ -856,7 +856,7 @@ void SIM_MODEL::SetParamValue( int aParamIndex, const std::string& aValue,
 {
     std::string value = aValue;
 
-    if( aNotation != SIM_VALUE::NOTATION::SI || aValue.find( ',' ) >= 0 )
+    if( aNotation != SIM_VALUE::NOTATION::SI || aValue.find( ',' ) != std::string::npos )
         value = SIM_VALUE::ConvertNotation( value, aNotation, SIM_VALUE::NOTATION::SI );
 
     doSetParamValue( aParamIndex, value );
diff --git a/pcbnew/specctra_import_export/specctra.cpp b/pcbnew/specctra_import_export/specctra.cpp
index 61e49ff97e..fc8343e6e7 100644
--- a/pcbnew/specctra_import_export/specctra.cpp
+++ b/pcbnew/specctra_import_export/specctra.cpp
@@ -250,6 +250,7 @@ void SPECCTRA_DB::readTIME( time_t* time_stamp )
         Expecting( time_toks );
 
     mytime.tm_year = atoi( CurText() ) - 1900;
+    mytime.tm_isdst = 0;   // useless param here.
 
     *time_stamp = mktime( &mytime );
 }
diff --git a/pcbnew/specctra_import_export/specctra_export.cpp b/pcbnew/specctra_import_export/specctra_export.cpp
index 2ab1fb5bde..d8469a2364 100644
--- a/pcbnew/specctra_import_export/specctra_export.cpp
+++ b/pcbnew/specctra_import_export/specctra_export.cpp
@@ -1229,7 +1229,6 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
             if( ! zone->IsOnCopperLayer() )
                 continue;
 
-
             // Now, build zone polygon on each copper layer where the zone
             // is living (zones can live on many copper layers)
             const int copperCount = aBoard->GetCopperLayerCount();
@@ -1313,7 +1312,7 @@ void SPECCTRA_DB::FromBOARD( BOARD* aBoard )
 
                         cutout = new PATH( window, T_polygon );
                         window->SetShape( cutout );
-                        cutout->layer_id = m_layerIds[ m_kicadLayer2pcb[ zone->GetLayer() ] ];
+                        cutout->layer_id = m_layerIds[ m_kicadLayer2pcb[ layer ] ];
                     }
 
                     // If the point in this iteration is the last of the contour, the next iteration