diff --git a/includes/common.php b/includes/common.php
index aaa4d6ea2..768921461 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -2,20 +2,24 @@
 
 ## Common Functions
 
-function sgn($int){
-  if($int < 0)
+function sgn($int)
+{
+  if ($int < 0)
+  {
     return -1;
-  elseif($int == 0)
+  } elseif ($int == 0) {
     return 0;
-  else
+  } else {
     return 1;
+  }
 }
 
 function get_sensor_rrd($device, $sensor)
 {
   global $config;
 
-  if($config['os'][$device['os']]['sensor_descr'] || $sensor['poller_type'] == "ipmi") 
+  # For IPMI, sensors tend to change order, and there is no index, so we prefer to use the description as key here.
+  if ($config['os'][$device['os']]['sensor_descr'] || $sensor['poller_type'] == "ipmi") 
   {
     $rrd_file = $config['rrd_dir']."/".$device['hostname']."/".safename("sensor-".$sensor['sensor_class']."-".$sensor['sensor_type']."-".$sensor['sensor_descr'] . ".rrd");
   } else {
@@ -23,7 +27,6 @@ function get_sensor_rrd($device, $sensor)
   }
 
   return($rrd_file);
-
 }
 
 function get_port_by_id($port_id)
diff --git a/includes/polling/ports.inc.php b/includes/polling/ports.inc.php
index 8c1d03acc..f5f616a1b 100755
--- a/includes/polling/ports.inc.php
+++ b/includes/polling/ports.inc.php
@@ -1,7 +1,9 @@
 <?php
 
-unset($ports);
-$ports = snmp_cache_ifIndex($device); // Cache Port List
+# FIXME Removed 28/4/2011 - this can go, right?
+#unset($ports);
+#$ports = snmp_cache_ifIndex($device); // Cache Port List
+# /FIXME
 
 #mysql_query("INSERT INTO `ports` (`device_id`,`ifIndex`) VALUES ('".$device['device_id']."','$ifIndex')");
 
diff --git a/poller.php b/poller.php
index 513f8d198..00676668b 100755
--- a/poller.php
+++ b/poller.php
@@ -350,7 +350,7 @@ while ($device = mysql_fetch_assoc($device_query))
   if ($debug) { echo("Updating " . $device['hostname'] . " - $poll_update_query \n"); }
   if (!mysql_query($poll_update_query))
   {
-    echo "ERROR: " . mysql_error() . "\nSQL: $poll_update_query\n";
+    echo("ERROR: " . mysql_error() . "\nSQL: $poll_update_query\n");
   }
   if (mysql_affected_rows() == "1") { echo("UPDATED!\n"); } else { echo("NOT UPDATED!\n"); }
 
diff --git a/scan-snmp.php b/scan-snmp.php
index ee8734d9b..c17edd4a5 100755
--- a/scan-snmp.php
+++ b/scan-snmp.php
@@ -9,12 +9,15 @@ $search = $argv[1] . "$";
 
 $data = trim(`cat ips-scanned.txt | grep alive | cut -d" " -f 1 | egrep $search`);
 
-foreach( explode("\n", $data) as $ip) {
+foreach (explode("\n", $data) as $ip)
+{
   $snmp = shell_exec("snmpget -t 0.2 -v2c -c ".$config['community']." $ip sysName.0");
-  if(strstr($snmp, "STRING")) {
+  if (strstr($snmp, "STRING"))
+  {
     $hostname = trim(str_replace("SNMPv2-MIB::sysName.0 = STRING: ","", $snmp));
-    if(mysql_result(mysql_query("SELECT COUNT(device_id) FROM devices WHERE hostname = '$hostname'"),0) == '0') {
-      if(gethostbyname($hostname) == gethostbyname($hostname.".".$config['mydomain'])) { $hostname = $hostname . ".".$config['mydomain']; }
+    if (mysql_result(mysql_query("SELECT COUNT(device_id) FROM devices WHERE hostname = '$hostname'"),0) == '0')
+    {
+      if (gethostbyname($hostname) == gethostbyname($hostname.".".$config['mydomain'])) { $hostname = $hostname . ".".$config['mydomain']; }
       addHost($hostname, $community, 'v2c');
       echo("Adding $hostname \n");
     }