Index: includes/discovery/sensors/checkpoint-mib.inc.php
===================================================================
--- includes/discovery/sensors/checkpoint-mib.inc.php	(revision 7142)
+++ includes/discovery/sensors/checkpoint-mib.inc.php	(working copy)
@@ -12,11 +12,12 @@
  */
 
 $mib = 'CHECKPOINT-MIB';
+
 echo(" $mib ");
 
-$chkpnt['temp'] = snmpwalk_cache_oid($device, 'tempertureSensorEntry', array(), $mib, mib_dirs('checkpoint'));
-$chkpnt['fan']  = snmpwalk_cache_oid($device, 'fanSpeedSensorEntry',  array(), $mib, mib_dirs('checkpoint'));
-$chkpnt['volt'] = snmpwalk_cache_oid($device, 'voltageSensorEntry', array(), $mib, mib_dirs('checkpoint'));
+$chkpnt['temp'] = snmpwalk_cache_oid($device, 'tempertureSensorEntry', array(), $mib);
+$chkpnt['fan']  = snmpwalk_cache_oid($device, 'fanSpeedSensorEntry',  array(), $mib);
+$chkpnt['volt'] = snmpwalk_cache_oid($device, 'voltageSensorEntry', array(), $mib);
 
 foreach ($chkpnt['temp'] as $index => $entry)
 {
@@ -45,7 +46,7 @@
   $oid   = '.1.3.6.1.4.1.2620.1.6.7.8.3.1.3.'.$index;
   $descr = $entry['voltageSensorName'];
   $value = $entry['voltageSensorValue'];
-  if (is_numeric($entry['voltageSensorValue']))
+  if (is_numeric($value) && $value > 0)
   {
     discover_sensor($valid['sensor'], 'voltage', $device, $oid, $index, 'checkpoint', $descr, 1, $value);
   }
@@ -56,7 +57,7 @@
 # CHECKPOINT-MIB::haStarted.0 = STRING: yes
 # CHECKPOINT-MIB::haState.0 = STRING: standby
 # CHECKPOINT-MIB::haStatCode.0 = INTEGER: 0
-$chkpnt['ha'] = snmp_get_multi($device, 'haProdName.0 haStarted.0 haState.0 haStatCode.0', '-OQUs', $mib, mib_dirs('checkpoint'));
+$chkpnt['ha'] = snmp_get_multi($device, 'haProdName.0 haStarted.0 haState.0 haStatCode.0', '-OQUs', $mib);
 
 if (isset($chkpnt['ha'][0]) && $chkpnt['ha'][0]['haStarted'] == 'yes')
 {
Index: includes/polling/os/gaia.inc.php
===================================================================
--- includes/polling/os/gaia.inc.php	(revision 7142)
+++ includes/polling/os/gaia.inc.php	(working copy)
@@ -13,11 +13,13 @@
 
 // SNMPv2-SMI::enterprises.2620.1.6.4.1.0 = STRING: "R76"
 
-$version = trim(snmp_get($device, "svnVersion.0", "-OQv", 'CHECKPOINT-MIB', mib_dirs('checkpoint')),'"');
-$hardware = trim(snmp_get($device, "svnApplianceProductName.0", "-OQv", 'CHECKPOINT-MIB', mib_dirs('checkpoint')),'"');
-$serial = trim(snmp_get($device, "svnApplianceSerialNumber.0", "-OQv", 'CHECKPOINT-MIB', mib_dirs('checkpoint')),'"');
-$features = trim(snmp_get($device, "haState.0", "-OQv", 'CHECKPOINT-MIB', mib_dirs('checkpoint')),'"');
+$mib = 'CHECKPOINT-MIB';
 
+$version  = snmp_get($device, 'svnVersion.0', '-OQv', $mib);
+$hardware = snmp_get($device, 'svnApplianceProductName.0', '-OQv', $mib);
+$serial   = snmp_get($device, 'svnApplianceSerialNumber.0', '-OQv', $mib);
+$features = snmp_get($device, 'haState.0', '-OQv', $mib);
+
 if (empty($hardware)) // Fallback since svnApplianceProductName is only supported since R77.10
 {
   $hardware = rewrite_unix_hardware($poll_device['sysDescr']);
Index: includes/polling/os/splat.inc.php
===================================================================
--- includes/polling/os/splat.inc.php	(revision 7142)
+++ includes/polling/os/splat.inc.php	(working copy)
@@ -13,11 +13,13 @@
 
 // SNMPv2-SMI::enterprises.2620.1.6.4.1.0 = STRING: "R76"
 
-$version = trim(snmp_get($device, "svnVersion.0", "-OQv", 'CHECKPOINT-MIB', mib_dirs('checkpoint')),'"');
-$hardware = trim(snmp_get($device, "svnApplianceProductName.0", "-OQv", 'CHECKPOINT-MIB', mib_dirs('checkpoint')),'"');
-$serial = trim(snmp_get($device, "svnApplianceSerialNumber.0", "-OQv", 'CHECKPOINT-MIB', mib_dirs('checkpoint')),'"');
-$features = trim(snmp_get($device, "haState.0", "-OQv", 'CHECKPOINT-MIB', mib_dirs('checkpoint')),'"');
+$mib = 'CHECKPOINT-MIB';
 
+$version  = snmp_get($device, 'svnVersion.0', '-OQv', $mib);
+$hardware = snmp_get($device, 'svnApplianceProductName.0', '-OQv', $mib);
+$serial   = snmp_get($device, 'svnApplianceSerialNumber.0', '-OQv', $mib);
+$features = snmp_get($device, 'haState.0', '-OQv', $mib);
+
 if (empty($hardware)) // Fallback since svnApplianceProductName is only supported since R77.10
 {
   $hardware = rewrite_unix_hardware($poll_device['sysDescr']);