diff --git a/source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx b/source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx
index f009774bbda7640b07176f7c8caec7fca99f9820..48f96a73d71dd9c73b8d38476d23771c139ef4f9 100644
--- a/source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx
+++ b/source/branches/BaM_Dev/Model/XS/XSM_MLP.cxx
@@ -131,7 +131,6 @@ void XSM_MLP::ReadTimeSteps(const string &line)
 	
 	while( pos < (int)line.size() )
 		fMLP_Time.push_back( atof( (StringLine::NextWord(line,pos,' ')).c_str() ));
-	
 	DBGL
 }
 
diff --git a/source/branches/BaM_Dev/src/XSModel.cxx b/source/branches/BaM_Dev/src/XSModel.cxx
index 24b0acea8cfc411bc0d3ee0eb32bdcab14b14efd..f2dcd636012be67a378fa513bcd59a8565a1f433 100644
--- a/source/branches/BaM_Dev/src/XSModel.cxx
+++ b/source/branches/BaM_Dev/src/XSModel.cxx
@@ -43,10 +43,10 @@ void XSModel::ReadNFO()
 	{
 		string line;
 		getline(NFO,line);
-		
+
 		XSModel::ReadLine(line);
 		
-	} while(NFO.eof());
+	} while(!NFO.eof());
 	
 	DBGL
 }
@@ -93,7 +93,7 @@ void XSModel::ReadRParam(const string &line)
 	DBGL
 	int pos = 0;
 	string keyword = tlc(StringLine::NextWord(line, pos, ' '));
-	if( keyword != "k_power" || keyword != "k_mass" )	// Check the keyword
+	if( keyword != "k_power" && keyword != "k_mass" )	// Check the keyword
 	{
 		ERROR << " Bad keyword : " << keyword << " Not found !" << endl;
 		exit(1);
@@ -112,7 +112,7 @@ void XSModel::ReadType(const string &line)
 	DBGL
 	int pos = 0;
 	string keyword = tlc(StringLine::NextWord(line, pos, ' '));
-	if( keyword != "k_fuel" || keyword != "k_reactor" )	// Check the keyword
+	if( keyword != "k_fuel" && keyword != "k_reactor" )	// Check the keyword
 	{
 		ERROR << " Bad keyword : " << keyword << " Not found !" << endl;
 		exit(1);