diff --git a/html/index.php b/html/index.php
index 210d44722..4e0759a96 100755
--- a/html/index.php
+++ b/html/index.php
@@ -41,7 +41,7 @@ foreach ($_GET as $key=>$get_var)
   }
 }
 
-$segments = explode('/', trim($_SERVER['PATH_INFO'], '/'));
+$segments = explode('/', trim($_SERVER['REQUEST_URI'], '/'));
 
 foreach ($segments as $pos => $segment)
 {
diff --git a/html/pages/devices.inc.php b/html/pages/devices.inc.php
index 5f0e06d78..c9eacfae5 100644
--- a/html/pages/devices.inc.php
+++ b/html/pages/devices.inc.php
@@ -237,7 +237,6 @@ if($format == "graph")
   $row = 1;
   foreach (dbFetchRows($query, $sql_param) as $device)
   {
-
     if (is_integer($row/2)) { $row_colour = $list_colour_a; } else { $row_colour = $list_colour_b; }
 
     if (device_permitted($device['device_id']))