diff --git a/htdocs/comm/propal/stats/index.php b/htdocs/comm/propal/stats/index.php
index e0805d385e6..39cb54b0516 100644
--- a/htdocs/comm/propal/stats/index.php
+++ b/htdocs/comm/propal/stats/index.php
@@ -46,6 +46,8 @@ $year = GETPOST('year')>0?GETPOST('year'):$nowyear;
 $startyear=$year-1;
 $endyear=$year;
 
+$mode=GETPOST('mode');
+
 
 /*
  * View
@@ -154,7 +156,6 @@ if (! $mesg)
 $data = $stats->getAverageByMonthWithPrevYear($endyear, $startyear);
 
 $fileurl_avg='';
-if (! isset($mode)) $mode=''; // TODO $mode not defined ?
 if (!$user->rights->societe->client->voir || $user->societe_id)
 {
     $filename_avg = $dir.'/ordersaverage-'.$user->id.'-'.$year.'.png';
@@ -262,7 +263,6 @@ $oldyear=0;
 foreach ($data as $val)
 {
     $year = $val['year'];
-    //print $avg; // TODO $avg not defined ?
     while (! empty($year) && $oldyear > $year+1)
     {	// If we have empty year
         $oldyear--;
diff --git a/htdocs/core/class/smtps.class.php b/htdocs/core/class/smtps.class.php
index 227e3dc2a70..a4c2cae4a25 100644
--- a/htdocs/core/class/smtps.class.php
+++ b/htdocs/core/class/smtps.class.php
@@ -1206,11 +1206,8 @@ class SMTPs
 		{
 			// Since this is an actual multi-part message
 			// We need to define a content message Boundary
-			// NOTE: This was 'multipart/alternative', but Windows based
-			//       mail servers have issues with this.
-			/*
-			 * TODO  Investigate "nested" boundary message parts
-			*/
+			// NOTE: This was 'multipart/alternative', but Windows based mail servers have issues with this.
+
 			//$content = 'Content-Type: multipart/related; boundary="' . $this->_getBoundary() . '"'   . "\r\n";
 			$content = 'Content-Type: multipart/mixed; boundary="' . $this->_getBoundary('mixed') . '"'   . "\r\n";
 
diff --git a/htdocs/core/modules/dons/html_cerfafr.modules.php b/htdocs/core/modules/dons/html_cerfafr.modules.php
index a3811f51d6d..5a0a5c24894 100644
--- a/htdocs/core/modules/dons/html_cerfafr.modules.php
+++ b/htdocs/core/modules/dons/html_cerfafr.modules.php
@@ -144,7 +144,7 @@ class html_cerfafr extends ModeleDon
 		        $form = str_replace('__MAIN_INFO_SOCIETE_ZIP__',$mysoc->zip,$form);
 		        $form = str_replace('__MAIN_INFO_SOCIETE_TOWN__',$mysoc->town,$form);
 		        $form = str_replace('__DONATOR_FIRSTNAME__',$don->firstname,$form);
-            $form = str_replace('__DONATOR_LASTNAME__',$don->lastname,$form);
+            	$form = str_replace('__DONATOR_LASTNAME__',$don->lastname,$form);
 		        $form = str_replace('__DONATOR_ADDRESS__',$don->address,$form);
 		        $form = str_replace('__DONATOR_ZIP__',$don->zip,$form);
 		        $form = str_replace('__DONATOR_TOWN__',$don->town,$form);