diff --git a/includes/polling/os/screenos.inc.php b/includes/polling/os/screenos.inc.php
index 280571bdcf..b9d8316177 100755
--- a/includes/polling/os/screenos.inc.php
+++ b/includes/polling/os/screenos.inc.php
@@ -2,17 +2,17 @@
 
 echo("Doing Juniper Netscreen (ScreenOS)");
 
-$version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "Juniper Netscreen \\1||\\2||\\3||\\4", $sysDescr);
+$version = preg_replace("/(.+)\ version\ (.+)\ \(SN:\ (.+)\,\ (.+)\)/", "\\1||\\2||\\3||\\4", $sysDescr);
 list($hardware,$version,$serial,$features) = explode("||", $version);
 
-$sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/screenos-sessions.rrd";
+$sessrrd  = $config['rrd_dir'] . "/" . $device['hostname'] . "/screenos_sessions.rrd";
 $sess_cmd  = $config['snmpget'] . " -M ".$config['mibdir'] . " -O qv -" . $device['snmpver'] . " -c " . $device['community'] . " " . $device['hostname'];
 $sess_cmd .= " .1.3.6.1.4.1.3224.16.3.2.0 .1.3.6.1.4.1.3224.16.3.3.0 .1.3.6.1.4.1.3224.16.3.4.0";
 $sess_data = shell_exec($sess_cmd);
 list ($sessalloc, $sessmax, $sessfailed) = explode("\n", $sess_data);
 
 if (!is_file($sessrrd)) {
-   shell_exec($config['rrdtool'] ." create $sessrrd --step 300 \
+   rrdtool_create($sessrrd, " --step 300 \
      DS:allocate:GAUGE:600:0:3000000 \
      DS:max:GAUGE:600:0:3000000 \
      DS:failed:GAUGE:600:0:1000 \
@@ -20,6 +20,10 @@ if (!is_file($sessrrd)) {
      RRA:AVERAGE:0.5:6:800 \
      RRA:AVERAGE:0.5:24:800 \
      RRA:AVERAGE:0.5:288:800 \
+     RRA:MIN:0.5:1:800 \
+     RRA:MIN:0.5:6:800 \
+     RRA:MIN:0.5:24:800 \
+     RRA:MIN:0.5:288:800 \
      RRA:MAX:0.5:1:800 \
      RRA:MAX:0.5:6:800 \
      RRA:MAX:0.5:24:800 \
@@ -28,6 +32,6 @@ if (!is_file($sessrrd)) {
 
 rrdtool_update("$sessrrd", "N:$sessalloc:$sessmax:$sessfailed");
 
-$graphs['netscreen_sessions'] = TRUE;
+$graphs['screenos_sessions'] = TRUE;
 
 ?>
diff --git a/includes/static-config.php b/includes/static-config.php
index 8767faf1a7..0fca26237e 100644
--- a/includes/static-config.php
+++ b/includes/static-config.php
@@ -194,6 +194,17 @@ $config['os'][$os]['over'][1]['text']   = "CPU Usage";
 $config['os'][$os]['over'][2]['graph']  = "device_mempools";
 $config['os'][$os]['over'][2]['text']   = "Memory Usage";
 
+$os = "fortigate";
+$config['os'][$os]['text']              = "Fortinet Fortigate";
+$config['os'][$os]['type']              = "firewall";
+$config['os'][$os]['over'][0]['graph']  = "device_bits";
+$config['os'][$os]['over'][0]['text']   = "Device Traffic";
+#$config['os'][$os]['over'][1]['graph']  = "device_processors";
+#$config['os'][$os]['over'][1]['text']   = "CPU Usage";
+#$config['os'][$os]['over'][2]['graph']  = "device_mempools";
+#$config['os'][$os]['over'][2]['text']   = "Memory Usage";
+
+
 $os = "routeros";
 $config['os'][$os]['text']		= "Mikrotik RouterOS";
 $config['os'][$os]['type']		= "network";
@@ -447,25 +458,25 @@ $config['os'][$os]['over'][0]['text']   = "Current";
 $os = "akcp";
 $config['os'][$os]['text']              = "AKCP SensorProbe";
 $config['os'][$os]['type']              = "environment";
-$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
 $config['os'][$os]['over'][0]['text']   = "Temperatures";
 
 $os = "minkelsrms";
 $config['os'][$os]['text']        	= "Minkels RMS";
 $config['os'][$os]['type']        	= "environment";
-$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
 $config['os'][$os]['over'][0]['text']   = "Temperatures";
 
 $os = "wxgoos";
 $config['os'][$os]['text']              = "ITWatchDogs Goose";
 $config['os'][$os]['type']              = "environment";
-$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
 $config['os'][$os]['over'][0]['text']   = "Temperatures";
 
 $os = "papouch-tme";
 $config['os'][$os]['text']       	= "Papouch TME";
 $config['os'][$os]['type']       	= "environment";
-$config['os'][$os]['over'][0]['graph']  = "device_temperature";
+$config['os'][$os]['over'][0]['graph']  = "device_temperatures";
 $config['os'][$os]['over'][0]['text']   = "Temperatures";
 
 $os = "dell-laser";
@@ -573,9 +584,9 @@ $config['graph_types']['device']['cras_sessions']['descr'] = 'Remote Access Sess
 $config['graph_types']['device']['fortigate_sessions']['section'] = 'firewall';
 $config['graph_types']['device']['fortigate_sessions']['order'] = '0';
 $config['graph_types']['device']['fortigate_sessions']['descr'] = 'Active Sessions';
-$config['graph_types']['device']['screenos_settings']['section'] = 'firewall';
-$config['graph_types']['device']['screenos_settings']['order'] = '0';
-$config['graph_types']['device']['screenos_settings']['descr'] = 'Active Sessions';
+$config['graph_types']['device']['screenos_sessions']['section'] = 'firewall';
+$config['graph_types']['device']['screenos_sessions']['order'] = '0';
+$config['graph_types']['device']['screenos_sessions']['descr'] = 'Active Sessions';
 
 $config['graph_types']['device']['bits']['section'] = 'netstats';
 $config['graph_types']['device']['bits']['order'] = '0';