diff --git a/CODING_CONVENTION.php b/CODING_CONVENTION.php
index 506c4fb6..8aaf138d 100644
--- a/CODING_CONVENTION.php
+++ b/CODING_CONVENTION.php
@@ -60,8 +60,8 @@ class m_mailman {
 ## when raising an error, use the following syntax ##
     $err->raise("classname",_("text in english"));
   }
-
-## at the end of a php-only file, we don't put a ?> ##
+}
+/* at the end of a php-only file, we don't put a ?> */
 
 ?>
 
diff --git a/awstats/awstats.cache.php b/awstats/awstats.cache.php
index 9362e114..bfbdfd87 100755
--- a/awstats/awstats.cache.php
+++ b/awstats/awstats.cache.php
@@ -4,6 +4,7 @@
 include("/usr/share/alternc/panel/class/config_nochk.php");
 
 $db->query("SELECT id,hostname FROM aws;");
+$d=array();
 while ($db->next_record()) {
  $d[]=$db->Record;
 }
diff --git a/awstats/bureau/admin/aws_edit.php b/awstats/bureau/admin/aws_edit.php
index 70a72a19..2fb08579 100644
--- a/awstats/bureau/admin/aws_edit.php
+++ b/awstats/bureau/admin/aws_edit.php
@@ -1,32 +1,32 @@
 <?php
 /*
- ----------------------------------------------------------------------
- AlternC - Web Hosting System
- Copyright (C) 2000-2012 by the AlternC Development Team. 
- https://alternc.org/ 
- ----------------------------------------------------------------------
- LICENSE
+   ----------------------------------------------------------------------
+   AlternC - Web Hosting System
+   Copyright (C) 2000-2012 by the AlternC Development Team. 
+   https://alternc.org/ 
+   ----------------------------------------------------------------------
+   LICENSE
 
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License (GPL)
- as published by the Free Software Foundation; either version 2
- of the License, or (at your option) any later version.
+   This program is free software; you can redistribute it and/or
+   modify it under the terms of the GNU General Public License (GPL)
+   as published by the Free Software Foundation; either version 2
+   of the License, or (at your option) any later version.
 
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
- To read the license please visit http://www.gnu.org/copyleft/gpl.html
- ----------------------------------------------------------------------
- Purpose of file: Edit a statistic set
- ----------------------------------------------------------------------
-*/
+   To read the license please visit http://www.gnu.org/copyleft/gpl.html
+   ----------------------------------------------------------------------
+   Purpose of file: Edit a statistic set
+   ----------------------------------------------------------------------
+ */
 require_once("../class/config.php");
 
 $fields = array (
-	"id" => array ("request", "integer", 0),
-);
+		"id" => array ("request", "integer", 0),
+		);
 getFields($fields);
 
 if (!$id) {
@@ -35,15 +35,15 @@ if (!$id) {
 	$r=$aws->get_stats_details($id);
 	if (!$r) {
 		$error=$err->errstr();
+	} else {
+		$id=$r["id"];
+		$hostname=$r["hostname"];
+		$awsusers=$r["users"];
+		$hostaliases=$r["hostaliases"];
+		$public=$r["public"];
 	}
 }
 
-$id=$r["id"];
-$hostname=$r["hostname"];
-$awsusers=$r["users"];
-$hostaliases=$r["hostaliases"];
-$public=$r["public"];
-
 include("aws_add.php");
 exit();
 
diff --git a/bureau/admin/ftp_edit.php b/bureau/admin/ftp_edit.php
index efa77285..e19723bf 100644
--- a/bureau/admin/ftp_edit.php
+++ b/bureau/admin/ftp_edit.php
@@ -49,6 +49,7 @@ if (!$id && !$create) {
 
 if (!$id && $create) { //creation
   echo "<h3>"._("Create a FTP account")."</h3>";
+  $rr=false;
 } else {
    echo "<h3>"._("Editing a FTP account")."</h3>";
   $rr=$ftp->get_ftp_details($id);
diff --git a/bureau/admin/ip_main.php b/bureau/admin/ip_main.php
index 64e235c4..82c41ca3 100644
--- a/bureau/admin/ip_main.php
+++ b/bureau/admin/ip_main.php
@@ -148,17 +148,19 @@ $lac = $authip->list_affected();
 foreach($list_ip as $i) {
   if (checkip($i['ip'])) {
     if ($i['subnet']==32) {
-      $txt="Address IPv4";
+      $txt=_("Address IPv4");
     } else {
-      $txt="Subnet IPv4";
+      $txt=_("Subnet IPv4");
     }
   } elseif (checkipv6($i['ip'])) {
     if ($i['subnet']==128) {
-      $txt="Address IPv6";
+      $txt=_("Address IPv6");
     } else {
-      $txt="Subnet IPv6";
+      $txt=_("Subnet IPv6");
     }
-  } 
+  } else {
+    $txt=_("Error with this IP");
+  }
   echo "<tr class='lst' ><td>{$i['infos']}</td><td>{$i['ip_human']}</td><td>$txt</td>";
   ?>
   <td><div class="ina edit"><a href="javascript:edit_ip(<?php echo "'".htmlentities($i['id'])."','".htmlentities($i['ip_human'])."','".htmlentities($i['infos'])."'"; ?>);"><?php __("Edit"); ?></a></div></td>