diff --git a/common/cli/command_export_pcb_dxf.cpp b/common/cli/command_export_pcb_dxf.cpp
index 7a02e77677..7621a4250d 100644
--- a/common/cli/command_export_pcb_dxf.cpp
+++ b/common/cli/command_export_pcb_dxf.cpp
@@ -29,6 +29,8 @@
 #include <macros.h>
 #include <wx/tokenzr.h>
 
+#include <locale_io.h>
+
 #define ARG_LAYERS "--layers"
 #define ARG_INCLUDE_REFDES "--include-refdes"
 #define ARG_INCLUDE_VALUE "--include-value"
@@ -101,6 +103,7 @@ int CLI::EXPORT_PCB_DXF_COMMAND::Perform( KIWAY& aKiway ) const
 
     dxfJob->m_printMaskLayer = layerMask;
 
+    LOCALE_IO dummy;    // Switch to "C" locale
     int exitCode = aKiway.ProcessJob( KIWAY::FACE_PCB, dxfJob.get() );
 
     return exitCode;
diff --git a/eeschema/sim/sim_model_kibis.cpp b/eeschema/sim/sim_model_kibis.cpp
index abe6d56c5c..44f6e6e272 100644
--- a/eeschema/sim/sim_model_kibis.cpp
+++ b/eeschema/sim/sim_model_kibis.cpp
@@ -82,7 +82,7 @@ std::string SPICE_GENERATOR_KIBIS::IbisDevice( const SPICE_ITEM& aItem, const st
     }
 
     KIBIS_COMPONENT* kcomp = kibis.GetComponent( std::string( ibisCompName ) );
-    
+
     if( !kcomp )
         THROW_IO_ERROR( wxString::Format( _( "Could not find IBIS component '%s'" ), ibisCompName ) );
 
@@ -221,6 +221,7 @@ std::string SPICE_GENERATOR_KIBIS::IbisDevice( const SPICE_ITEM& aItem, const st
 
 SIM_MODEL_KIBIS::SIM_MODEL_KIBIS( TYPE aType ) :
         SIM_MODEL( aType, std::make_unique<SPICE_GENERATOR_KIBIS>( *this ) ),
+        m_enableDiff( false ),
         m_sourceModel( nullptr )
 {
     static std::vector<PARAM::INFO> device = makeParamInfos( TYPE::KIBIS_DEVICE );
@@ -386,7 +387,7 @@ std::vector<SIM_MODEL::PARAM::INFO> SIM_MODEL_KIBIS::makeParamInfos( TYPE aType
     paramInfo.spiceModelName = "";
     paramInfo.enumValues = { "TYP", "MIN", "MAX" };
     paramInfos.push_back( paramInfo );
-    
+
     std::vector<PARAM::INFO> dc = makeDcWaveformParamInfos();
     std::vector<PARAM::INFO> rect = makeRectWaveformParamInfos();
     std::vector<PARAM::INFO> prbs = makePrbsWaveformParamInfos();