diff --git a/includes/definitions.inc.php b/includes/definitions.inc.php
index 0b3d08490c..0d3ffc2e29 100644
--- a/includes/definitions.inc.php
+++ b/includes/definitions.inc.php
@@ -315,6 +315,7 @@ $config['os'][$os]['over'][0]['text']  = 'Traffic';
 $os = 'calix';
 $config['os'][$os]['text']             = 'Calix E7';
 $config['os'][$os]['type']             = 'network';
+$config['os'][$os]['ifname']           = 1;
 $config['os'][$os]['icon']             = 'calix';
 $config['os'][$os]['over'][0]['graph'] = 'device_bits';
 $config['os'][$os]['over'][0]['text']  = 'Device Traffic';
diff --git a/includes/polling/os/calix.inc.php b/includes/polling/os/calix.inc.php
index c4e22dca44..638d139418 100644
--- a/includes/polling/os/calix.inc.php
+++ b/includes/polling/os/calix.inc.php
@@ -1,5 +1,6 @@
 <?php
 // Device might not have a card 1 (or even card2 if it is an E7-20)
-$version = trim(strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL),'"');
+$version = strtok(snmp_walk($device, "e7CardSoftwareVersion.1", "-OQv", "E7-Calix-MIB"), PHP_EOL);
 $hardware = "Calix " . $poll_device['sysDescr'];
 $features = str_replace(PHP_EOL, ', ', snmp_walk($device, "e7CardProvType", "-OQv", "E7-Calix-MIB"));
+$serial = str_replace(PHP_EOL, ', ', snmp_walk($device, "e7CardSerialNumber", "-OQv", "E7-Calix-MIB"));