diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php
index b3c17e6022..78660fa8cb 100644
--- a/html/includes/print-interface.inc.php
+++ b/html/includes/print-interface.inc.php
@@ -42,7 +42,7 @@ if ($port_details)
 {
   foreach (dbFetchRows("SELECT * FROM `ipv4_addresses` WHERE `interface_id` = ?", array($interface['interface_id'])) as $ip) 
   {
-    echo("$break <a class=interface-desc href=\"javascript:popUp('/netcmd.php?cmd=whois&amp;query=$ip[ipv4_address]')\">$ip[ipv4_address]/$ip[ipv4_prefixlen]</a>");
+    echo("$break <a class=interface-desc href=\"javascript:popUp('/netcmd.php?cmd=whois&amp;query=$ip[ipv4_address]')\">".$ip['ipv4_address']."/".$ip['ipv4_prefixlen']."</a>");
     $break = "<br />";
   }
   foreach (dbFetchRows("SELECT * FROM `ipv6_addresses` WHERE `interface_id` = ?", array($interface['interface_id'])) as $ip6)
@@ -145,7 +145,7 @@ if (strpos($interface['label'], "oopback") === false && !$graph_type)
            AND A.ipv4_network_id = ? AND D.device_id = I.device_id
            AND D.device_id != ?";
       $array = array($net['ipv4_network_id'], $device['device_id']);
-      foreach(dbFetchRow($sql, $array) AS $new)
+      foreach(dbFetchRows($sql, $array) AS $new)
       {
         echo($new['ipv4_network_id']);
         $this_ifid = $new['interface_id'];
@@ -166,7 +166,7 @@ if (strpos($interface['label'], "oopback") === false && !$graph_type)
            AND D.device_id != ? AND A.ipv6_origin != 'linklayer' AND A.ipv6_origin != 'wellknown'";
       $array = array($net['ipv6_network_id'], $device['device_id']);
 
-      foreach(dbFetchRow($sql, $array) AS $new)
+      foreach(dbFetchRows($sql, $array) AS $new)
       {
         echo($new['ipv6_network_id']);
           $this_ifid = $new['interface_id'];
diff --git a/includes/common.php b/includes/common.php
index 6ef37cfed1..d36a0abfdf 100644
--- a/includes/common.php
+++ b/includes/common.php
@@ -167,12 +167,12 @@ function getifindexbyid($id)
 
 function get_port_by_ifIndex($device, $ifIndex)
 {
-  return dbFetchCell("SELECT * FROM `ports` WHERE `device_id` = ? AND `ifIndex` = ?", array($device['device_id'], $ifIndex));
+  return dbFetchRow("SELECT * FROM `ports` WHERE `device_id` = ? AND `ifIndex` = ?", array($device['device_id'], $ifIndex));
 }
 
 function getifbyid($id)
 {
-  return dbFetchCell("SELECT * FROM `ports` WHERE `interface_id` = ?", array($id));
+  return dbFetchRow("SELECT * FROM `ports` WHERE `interface_id` = ?", array($id));
 }
 
 function getifdescrbyid($id)
@@ -221,7 +221,7 @@ function set_dev_attrib($device, $attrib_type, $attrib_value)
 function get_dev_attribs($device)
 {
   $attribs = array();
-  foreach(dbFetch("SELECT * FROM devices_attribs WHERE `device_id` = ?", array($device)) as $entry)
+  foreach(dbFetchRow("SELECT * FROM devices_attribs WHERE `device_id` = ?", array($device)) as $entry)
   {
     $attribs[$entry['attrib_type']] = $entry['attrib_value'];
   }