diff --git a/McZapkie/Mover.cpp b/McZapkie/Mover.cpp
index 1d894dd0..41544942 100644
--- a/McZapkie/Mover.cpp
+++ b/McZapkie/Mover.cpp
@@ -11395,7 +11395,7 @@ void TMoverParameters::LoadFIZ_PowerParamsDecode( TPowerParameters &Powerparamet
 		    extract_value(PantType, "PantType", Line, "");
             if (PantType == "AKP_4E")
 			    collectorparameters.PantographType = TPantType::AKP_4E;
-		    if (PantType._Starts_with("DSA")) // zakladam ze wszystkie pantografy DSA sa takie same
+		    if (PantType.rfind("DSA",0) == 0) // zakladam ze wszystkie pantografy DSA sa takie same
 			    collectorparameters.PantographType = TPantType::DSAx;
 		    if (PantType == "EC160" || PantType == "EC200")
 			    collectorparameters.PantographType = TPantType::EC160_200;
diff --git a/application.h b/application.h
index 3cc73ff0..97068afc 100644
--- a/application.h
+++ b/application.h
@@ -38,7 +38,7 @@ public:
         run();
     // issues request for a worker thread to perform specified task. returns: true if task was scheduled
 
-    void eu07_application::DiscordRPCService(); // discord rich presence service function (runs as separate thread)
+    void DiscordRPCService(); // discord rich presence service function (runs as separate thread)
     bool
         request( python_taskqueue::task_request const &Task );
     // ensures the main thread holds the python gil and can safely execute python calls
diff --git a/particles.cpp b/particles.cpp
index 361f2b8c..a1a9ef8d 100644
--- a/particles.cpp
+++ b/particles.cpp
@@ -474,7 +474,8 @@ particle_manager::find( std::string const &Template ) {
     }
     // ... and if it fails try to add the template to the database from a data file
     smoke_source source;
-    if( source.deserialize( cParser( templatepath + templatename + ".txt", cParser::buffer_FILE ) ) ) {
+    cParser sound_parser( templatepath + templatename + ".txt", cParser::buffer_FILE );
+    if( source.deserialize( sound_parser ) ) {
         // if deserialization didn't fail finish source setup...
         source.m_opacitymodifier.bind( &Global.SmokeFidelity );
         // ...then cache the source as template for future instances