diff --git a/CMakeModules/Findngspice.cmake b/CMakeModules/Findngspice.cmake
index 880ae1169e..640de43ecc 100644
--- a/CMakeModules/Findngspice.cmake
+++ b/CMakeModules/Findngspice.cmake
@@ -22,6 +22,7 @@
 
 find_path( NGSPICE_INCLUDE_DIR ngspice/sharedspice.h
     PATHS ${NGSPICE_ROOT_DIR} $ENV{NGSPICE_ROOT_DIR} ${NGSPICE_INCLUDE_PATH}
+          ${NGSPICE_ROOT_DIR}/include
     PATH_SUFFIXES src/include share/ngspice/include share/ngspice/include/ngspice
 )
 
diff --git a/common/page_layout/ws_data_model_io.cpp b/common/page_layout/ws_data_model_io.cpp
index 701b1e0d7a..40ee677f2c 100644
--- a/common/page_layout/ws_data_model_io.cpp
+++ b/common/page_layout/ws_data_model_io.cpp
@@ -159,6 +159,8 @@ void WS_DATA_MODEL::SaveInString( std::vector<WS_DATA_ITEM*> aItemsList, wxStrin
 {
     WS_DATA_MODEL_STRINGIO writer( aOutputString );
 
+    LOCALE_IO   toggle;     // switch on/off the locale "C" notation
+
     for( WS_DATA_ITEM* item : aItemsList )
         writer.Format( this, item, 0 );
 }