diff --git a/network/cyberoam/snmp/mode/cpu.pm b/network/cyberoam/snmp/mode/cpu.pm
index 5fda445f4..4392467f6 100644
--- a/network/cyberoam/snmp/mode/cpu.pm
+++ b/network/cyberoam/snmp/mode/cpu.pm
@@ -66,7 +66,7 @@ sub run {
     $self->{output}->output_add(severity => $exit,
                                 short_msg => sprintf("CPU Usage : %.2f", $result->{$oid_cpuPercentUsage}));
     $self->{output}->perfdata_add(label => "cpu",
-                                  value => $result->{$oid_cpuPercentUsage},
+                                  value => sprintf("%.2f", $result->{$oid_cpuPercentUsage}),
                                   warning => $self->{perfdata}->get_perfdata_for_output(label => 'warning'),
                                   critical => $self->{perfdata}->get_perfdata_for_output(label => 'critical'),
                                   min => 0);
diff --git a/network/cyberoam/snmp/mode/requests.pm b/network/cyberoam/snmp/mode/requests.pm
index 7a84d7dd4..c67433565 100644
--- a/network/cyberoam/snmp/mode/requests.pm
+++ b/network/cyberoam/snmp/mode/requests.pm
@@ -114,11 +114,11 @@ sub manage_selection {
     $self->{cache_name} = "cyberoam_" . $options{snmp}->get_hostname()  . '_' . $options{snmp}->get_port() . '_' . $self->{mode} . '_' .
         (defined($self->{option_results}->{filter_counters}) ? md5_hex($self->{option_results}->{filter_counters}) : md5_hex('all'));
     
-    $self->{global} = { http_hits => $result->{'.1.3.6.1.4.1.3417.2.11.3.1.1.1.0'},
-                        ftp_hits => $result->{'.1.3.6.1.4.1.3417.2.11.3.1.1.2.0'},
-                        pop3_hits => $result->{'.1.3.6.1.4.1.3417.2.11.3.1.1.3.0'},
-                        imap_hits => $result->{'.1.3.6.1.4.1.3417.2.11.3.1.1.4.0'}, 
-                        smtp_hits => $result->{'.1.3.6.1.4.1.3417.2.11.3.1.1.5.0'} };
+    $self->{global} = { http_hits => $result->{$oid_httpHits},
+                        ftp_hits => $result->{$oid_ftpHits},
+                        pop3_hits => $result->{$oid_pop3Hits},
+                        imap_hits => $result->{$oid_imapHits}, 
+                        smtp_hits => $result->{$oid_smtpHits} };
 }
 
 1;
diff --git a/network/cyberoam/snmp/mode/storage.pm b/network/cyberoam/snmp/mode/storage.pm
index d1643bd7a..026016b75 100644
--- a/network/cyberoam/snmp/mode/storage.pm
+++ b/network/cyberoam/snmp/mode/storage.pm
@@ -106,8 +106,7 @@ sub manage_selection {
     my $oid_diskPercentUsage = '.1.3.6.1.4.1.21067.2.1.2.3.2.0';
     my $result = $options{snmp}->get_leef(oids => [$oid_diskCapacity, $oid_diskPercentUsage],
                                           nothing_quit => 1);
-    my $memory_used = $result->{$oid_memoryPercentUsage} * $result->{$oid_memoryCapacity} * 1024 * 1024 / 100;
-    $self->{memory} = { used =>  $result->{$oid_diskPercentUsage} * $result->{$oid_diskCapacity} * 1024 * 1024 / 100;, 
+    $self->{storage} = { used => $result->{$oid_diskPercentUsage} * $result->{$oid_diskCapacity} * 1024 * 1024 / 100, 
         total => $result->{$oid_diskCapacity} * 1024 * 1024 };
 }