diff --git a/simulators/c++2/src_simulator/TEPE/PropRelConstraint.cpp b/simulators/c++2/src_simulator/TEPE/PropRelConstraint.cpp
index 062011494f4ec348adf242b4bce7b07c45749a3c..8c535b698637e89c64d9a8a38198032dce0a95fa 100644
--- a/simulators/c++2/src_simulator/TEPE/PropRelConstraint.cpp
+++ b/simulators/c++2/src_simulator/TEPE/PropRelConstraint.cpp
@@ -77,4 +77,4 @@ void PropRelConstraint::notifyEnable(unsigned int iSigState){
 //}
 
 void PropRelConstraint::reset(){
-}
\ No newline at end of file
+}
diff --git a/simulators/c++2/src_simulator/app/TMLActionCommand.cpp b/simulators/c++2/src_simulator/app/TMLActionCommand.cpp
index e1742d0cf4f22fa4cebace63ce45ba5a5d6f1dd1..169fd8371e716116b04b0177cd9149a9d5e2169b 100644
--- a/simulators/c++2/src_simulator/app/TMLActionCommand.cpp
+++ b/simulators/c++2/src_simulator/app/TMLActionCommand.cpp
@@ -81,4 +81,4 @@ std::string TMLActionCommand::toString(TMLLength aLength, TMLLength aProgress) c
 	std::ostringstream outp;	
 	outp << "Action in " << TMLCommand::toString(aLength, aProgress);
 	return outp.str();
-}
\ No newline at end of file
+}
diff --git a/simulators/c++2/src_simulator/definitions.h b/simulators/c++2/src_simulator/definitions.h
index a70db8932aa4d123fec7368ac5dfd457b24827d2..2cf89988ce176ca67ec4a4841ac8e1e8e46c2c61 100644
--- a/simulators/c++2/src_simulator/definitions.h
+++ b/simulators/c++2/src_simulator/definitions.h
@@ -844,7 +844,7 @@ namespace std{
 		return p1->_time > p2->_time;
 	}
 	};
-};
+}
 
 ///Priority queue for SignalChangeData objects, keeps track of the temporal ordering of signal changes (for VCD output)
 typedef std::priority_queue<SignalChangeData*, std::vector<SignalChangeData*>, std::greater<SignalChangeData*> > SignalChangeQueue;
diff --git a/simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp b/simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp
index 918ea3ae24d40646e444046f6ddff62d550b71d1..a469357ea430ca4da1cec3f99f92d39a4e750ac4 100644
--- a/simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp
+++ b/simulators/c++2/src_simulator/evt/ListenersSimCmd.cpp
@@ -159,7 +159,7 @@ CondBreakpoint::CondBreakpoint(SimComponents* iSimComp, std::string iCond, TMLTa
 		std::cout << "Error " << dlerror() << " occurred when opening shared library.\n";
 		return;
 	}
-	_condFunc = (BreakCondFunc) dlsym( _dlHandle, "condFunc");
+	_condFunc = (BreakCondFunc)(intptr_t) dlsym( _dlHandle, "condFunc");
 	if (dlerror() != NULL) {
 		std::cout << "Error when getting function handle\n";
     		return;
diff --git a/simulators/c++2/src_simulator/sim/ServerHelp.cpp b/simulators/c++2/src_simulator/sim/ServerHelp.cpp
index 62edc88c32f86cd58cfb0be4e1e32879af788203..c71ea9537a2056f32b6fe5c77d5a7be4d3decbf5 100644
--- a/simulators/c++2/src_simulator/sim/ServerHelp.cpp
+++ b/simulators/c++2/src_simulator/sim/ServerHelp.cpp
@@ -198,4 +198,4 @@ std::vector<std::string> ServerHelp::splitData (std::string s, std::string delim
         token = trim(token.substr(pos + 2));
     res.push_back(token);
     return res;
-}
\ No newline at end of file
+}
diff --git a/simulators/c++2/src_simulator/sim/ServerHelp.h b/simulators/c++2/src_simulator/sim/ServerHelp.h
index 42bc3e450b4b622296fd7fda8b4cf15c1b85f976..297d87519071c4a5397bc00b25a2f5c837621e36 100644
--- a/simulators/c++2/src_simulator/sim/ServerHelp.h
+++ b/simulators/c++2/src_simulator/sim/ServerHelp.h
@@ -86,4 +86,4 @@ public:
 	std::map <std::string, std::string> aliasMapWithName;
 	std::string helpServerContent;
 
-};
\ No newline at end of file
+};
diff --git a/src/main/java/tmltranslator/tomappingsystemc2/Penalties.java b/src/main/java/tmltranslator/tomappingsystemc2/Penalties.java
index c9f8ad5da934e02aead7e9f83bd23376f93b0398..4ebac721f047df85551fa1b6f4834b54599e8207 100644
--- a/src/main/java/tmltranslator/tomappingsystemc2/Penalties.java
+++ b/src/main/java/tmltranslator/tomappingsystemc2/Penalties.java
@@ -106,9 +106,9 @@ public class Penalties {
 
         data = FILE_HEADER + "\n";
         if (mustHandlePenalties) {
-            data += ACTIVATED;
+            data += ACTIVATED + "\n";
         } else {
-            data += NOT_ACTIVATED;
+            data += NOT_ACTIVATED + "\n";
         }
 
         try {