diff --git a/includes/discovery/functions.inc.php b/includes/discovery/functions.inc.php
index aa9e691a8c..a8bcff75f6 100644
--- a/includes/discovery/functions.inc.php
+++ b/includes/discovery/functions.inc.php
@@ -134,7 +134,7 @@ function discover_device(&$device, $options = null)
 
     load_os($device);
     load_discovery($device);
-    register_mibs($device, Config::getOsSetting($device, 'register_mibs', array()), 'includes/discovery/os/' . $device['os'] . '.inc.php');
+    register_mibs($device, Config::getOsSetting($device['os'], 'register_mibs', array()), 'includes/discovery/os/' . $device['os'] . '.inc.php');
 
     echo "\n";
 
@@ -150,7 +150,7 @@ function discover_device(&$device, $options = null)
         }
     }
     foreach (Config::get('discovery_modules', array()) as $module => $module_status) {
-        $os_module_status = Config::getOsSetting($device, "discovery_modules.$module");
+        $os_module_status = Config::getOsSetting($device['os'], "discovery_modules.$module");
         d_echo("Modules status: Global" . (isset($module_status) ? ($module_status ? '+ ' : '- ') : '  '));
         d_echo("OS" . (isset($os_module_status) ? ($os_module_status ? '+ ' : '- ') : '  '));
         d_echo("Device" . (isset($attribs['discover_' . $module]) ? ($attribs['discover_' . $module] ? '+ ' : '- ') : '  '));
@@ -798,7 +798,7 @@ function discover_process_ipv6(&$valid, $ifIndex, $ipv6_address, $ipv6_prefixlen
 */
 function check_entity_sensor($string, $device)
 {
-    $fringe = array_merge(Config::get('bad_entity_sensor_regex', array()), Config::getOsSetting($device, 'bad_entity_sensor_regex', array()));
+    $fringe = array_merge(Config::get('bad_entity_sensor_regex', array()), Config::getOsSetting($device['os'], 'bad_entity_sensor_regex', array()));
 
     foreach ($fringe as $bad) {
         if (preg_match($bad . "i", $string)) {
@@ -1166,7 +1166,7 @@ function sensors($types, $device, $valid, $pre_cache = array())
         if (is_file($dir . $device['os'] . '.inc.php')) {
             include $dir . $device['os'] . '.inc.php';
         }
-        if (Config::getOsSetting($device, 'rfc1628_compat', false)) {
+        if (Config::getOsSetting($device['os'], 'rfc1628_compat', false)) {
             if (is_file($dir  . '/rfc1628.inc.php')) {
                 include $dir . '/rfc1628.inc.php';
             }
diff --git a/includes/discovery/sensors/runtime/rfc1628.inc.php b/includes/discovery/sensors/runtime/rfc1628.inc.php
index b60c66c021..34072a2368 100644
--- a/includes/discovery/sensors/runtime/rfc1628.inc.php
+++ b/includes/discovery/sensors/runtime/rfc1628.inc.php
@@ -2,7 +2,7 @@
 
 echo 'RFC1628 ';
 
-// UPS-MIB::upsSeconsOnBattery
+// UPS-MIB::upsSecondsOnBattery
 $secs_on_battery_oid = '.1.3.6.1.2.1.33.1.2.2.0';
 $secs_on_battery = snmp_get($device, $secs_on_battery_oid, '-Oqv');