diff --git a/.gitignore b/.gitignore
index 47a090737..28a11c6bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,7 +17,6 @@ _site
 RUNNING_PID
 conf/solr/cores/collins/data
 .DS_Store
-Gemfile.lock
 
 .cache-main
 .cache-tests
diff --git a/app/collins/models/LshwHelper.scala b/app/collins/models/LshwHelper.scala
index 4a6f27bb2..72df84c8c 100644
--- a/app/collins/models/LshwHelper.scala
+++ b/app/collins/models/LshwHelper.scala
@@ -213,14 +213,14 @@ object LshwHelper extends CommonHelper[LshwRepresentation] {
       val baseDescription = amfinder(seq, BaseDescription, _.toString, "")
       val baseProduct = amfinder(seq, BaseProduct, _.toString, "")
       val baseVendor = amfinder(seq, BaseVendor, _.toString, "")
-      val baseSerial = amfinder(seq, BaseSerial, _.toString, "")
+      val baseSerial = amfinder(seq, BaseSerial, x => if (x.isEmpty) { None } else { Some(x) }, None)
       Seq(ServerBase(baseDescription, baseProduct, baseVendor, baseSerial))
     }.getOrElse(Nil)
 
     val filteredMeta = meta.map { case(groupId, metaSeq) =>
       val newSeq = filterNot(
         metaSeq,
-        Set(BaseDescription.id, BaseProduct.id, BaseVendor.id)
+        Set(BaseDescription.id, BaseProduct.id, BaseVendor.id, BaseSerial.id)
       )
       groupId -> newSeq
     }
@@ -229,12 +229,15 @@ object LshwHelper extends CommonHelper[LshwRepresentation] {
 
   protected def collectBase(asset: Asset, lshw: LshwRepresentation): Seq[AssetMetaValue] = {
     val base = lshw.base
-    Seq(
+    val expectedAttrs = Seq(
       AssetMetaValue(asset, BaseDescription.id, base.description),
       AssetMetaValue(asset, BaseProduct.id, base.product),
-      AssetMetaValue(asset, BaseVendor.id, base.vendor),
-      AssetMetaValue(asset, BaseSerial.id, base.serial)
+      AssetMetaValue(asset, BaseVendor.id, base.vendor)
     )
+    base.serial match {
+      case Some(x) => expectedAttrs ++ Seq(AssetMetaValue(asset, BaseSerial.id, base.serial.get))
+      case None    => expectedAttrs
+    }
   }
 
 }
diff --git a/app/collins/models/lshw/ServerBase.scala b/app/collins/models/lshw/ServerBase.scala
index eee1378cf..0400ed353 100644
--- a/app/collins/models/lshw/ServerBase.scala
+++ b/app/collins/models/lshw/ServerBase.scala
@@ -12,7 +12,7 @@ object ServerBase {
       (json \ "DESCRIPTION").as[String],
       (json \ "PRODUCT").as[String],
       (json \ "VENDOR").as[String],
-      (json \ "SERIAL").as[String]))
+      (json \ "SERIAL").asOpt[String]))
     override def writes(serverbase: ServerBase) = JsObject(Seq(
       "DESCRIPTION" -> Json.toJson(serverbase.description),
       "PRODUCT" -> Json.toJson(serverbase.product),
@@ -22,7 +22,7 @@ object ServerBase {
 }
 
 case class ServerBase(
-    description: String = "", product: String = "", vendor: String = "", serial: String = "") extends LshwAsset {
+    description: String = "", product: String = "", vendor: String = "", serial: Option[String] = None) extends LshwAsset {
   import ServerBase._
   override def toJsValue() = Json.toJson(this)
 
diff --git a/app/collins/util/config/LldpConfig.scala b/app/collins/util/config/LldpConfig.scala
index 1f1feb4c3..201242434 100644
--- a/app/collins/util/config/LldpConfig.scala
+++ b/app/collins/util/config/LldpConfig.scala
@@ -5,8 +5,10 @@ object LldpConfig extends Configurable {
   override val referenceConfigFilename = "lldp_reference.conf"
 
   def requireVlanName = getBoolean("requireVlanName", true)
+  def requireVlanId = getBoolean("requireVlanId", false)
 
   override protected def validateConfig() {
     requireVlanName
+    requireVlanId
   }
 }
diff --git a/app/collins/util/parsers/LldpParser.scala b/app/collins/util/parsers/LldpParser.scala
index 433bea3dd..cfb9c6ab1 100644
--- a/app/collins/util/parsers/LldpParser.scala
+++ b/app/collins/util/parsers/LldpParser.scala
@@ -67,16 +67,21 @@ class LldpParser(txt: String) extends CommonParser[LldpRepresentation](txt) {
   }
 
   protected def findVlans(seq: NodeSeq): Seq[Vlan] = {
+    // TODO(gabe): make this less brittle and handle missing vlan-id
     (seq \\ "vlan").foldLeft(Seq[Vlan]()) {
+      // some switches don't report a vlan-id, despite a VLAN being configured
+      // on an interface. Lets be flexible here and allow it to be empty.
       case (vseq, vlan) =>
-        val id = Option(vlan \ "@vlan-id" text).filter(_.nonEmpty).getOrElse("")
+        val idOpt = Option(vlan \ "@vlan-id" text).filter(_.nonEmpty)
         val name = vlan.text
         if (LldpConfig.requireVlanName) {
-          requireNonEmpty((id -> "vlan-id"), (name -> "vlan name"))
-        } else {
-          requireNonEmpty((id -> "vlan-id"))
+          requireNonEmpty((name -> "vlan name"))
         }
-        Vlan(id.toInt, name) +: vseq
+        if (LldpConfig.requireVlanId) {
+          requireNonEmpty((idOpt.getOrElse("") -> "vlan id"))
+        }
+        val id = idOpt.map(_.toInt).getOrElse(0)
+        Vlan(id, name) +: vseq
     }
   }
 
diff --git a/app/collins/util/parsers/LshwParser.scala b/app/collins/util/parsers/LshwParser.scala
index d1a12a778..97dbfa0d0 100644
--- a/app/collins/util/parsers/LshwParser.scala
+++ b/app/collins/util/parsers/LshwParser.scala
@@ -184,13 +184,14 @@ class LshwParser(txt: String) extends CommonParser[LshwRepresentation](txt) {
     // the correct element
     if ((elem \ "@class" text).toString == "system") {
       val asset = getAsset(elem)
-      val serial = (elem \ "serial" text)
+      // serial may be missing, so be flexible here and allow it to be absent
+      val serial = (elem \ "serial" headOption).map(_.text)
       ServerBase(asset.description, asset.product, asset.vendor, serial)
     } // To spice things up, sometimes we get <list>$everything</list>
     // instead of just $everything
     else if (((elem \ "node") \ "@class" text) == "system") {
       val asset = getAsset(elem \ "node")
-      val serial = (elem \ "serial" text)
+      val serial = (elem \ "serial" headOption).map(_.text)
       ServerBase(asset.description, asset.product, asset.vendor, serial)
     } else {
       throw MalformedAttributeException("Expected root class=system node attribute")
diff --git a/app/views/asset/show_overview.scala.html b/app/views/asset/show_overview.scala.html
index 03a9e50a5..42d611963 100644
--- a/app/views/asset/show_overview.scala.html
+++ b/app/views/asset/show_overview.scala.html
@@ -24,13 +24,15 @@ <h3>Asset Overview <small>System and user attributes</small></h3>
         }
         @if(aa.addresses.size > 0) {
         <tr>
-          <th>Ip Addresses</th>
+          <th><strong>IP Addresses</strong></th>
           <td>@TagDecorator.decorate("IP_ADDRESS", aa.addresses.map(_.dottedAddress).toList, ", ")</td>
           <td>Primary IP Addresses</td>
         </tr>
         }
         <tr>
-          <th>Asset Tag</th>
+          <th>
+            <strong data-rel="tooltip" title="" data-original-title="TAG">Asset Tag</strong>
+          </th>
           @if(SoftLayerConfig.enabled && SoftLayer.isSoftLayerAsset(aa.asset)) {
             @slLink(aa.asset, aa.asset.tag)
           } else {
@@ -40,7 +42,7 @@ <h3>Asset Overview <small>System and user attributes</small></h3>
         </tr>
         <tr>
           @defining(aa.asset.nodeClass){ nodeclass =>
-          <th>Classification</th>
+          <th><strong>Classification</strong> <a href="https://tumblr.github.io/collins/configuration.html#node classifier"><i class="glyphicon glyphicon-question-sign" data-rel="tooltip" title="" data-original-title="Asset classification according to node classifier"></i></a></th>
           <td>
             <span>
               @nodeclass.map { nc =>
@@ -60,12 +62,12 @@ <h3>Asset Overview <small>System and user attributes</small></h3>
           }
         </tr>
         <tr>
-          <th>Asset Type</th>
+          <th><strong>Asset Type<strong> <a href="https://tumblr.github.io/collins/concepts.html#assets"><i class="glyphicon glyphicon-question-sign"></i></a></th>
           <td>@aa.asset.assetType.label</td>
           <td></td>
         </tr>
         <tr class="@statusClassFromAsset(aa.asset)">
-          <td><strong>Asset Status</strong></td>
+          <td><strong>Asset Status</strong> <a href="https://tumblr.github.io/collins/concepts.html#status & state"><i class="glyphicon glyphicon-question-sign"></i></a></td>
           <td>@aa.asset.getStatusName</td>
           @if(aa.asset.isMaintenance) {
             <td><a href="#user-log-section"><span class="label label-primary">See Notes</span></a> @aa.asset.status.description</td>
@@ -76,7 +78,7 @@ <h3>Asset Overview <small>System and user attributes</small></h3>
 @if(aa.asset.stateId != 0) {
   @State.findById(aa.asset.stateId).map { state =>
         <tr>
-          <th>Asset State</th>
+          <th><strong>Asset State</strong> <a href="https://tumblr.github.io/collins/concepts.html#status & state"><i class="glyphicon glyphicon-question-sign"></i></a></th>
           <td>@state.label</td>
           <td>@state.description</td>
         </tr>
@@ -94,7 +96,12 @@ <h3>Asset Overview <small>System and user attributes</small></h3>
         </tr>
         @MetaValueOrderer.order(aa.mvs.filter(_.getName() != "HOSTNAME")).map { case(size, mv) =>
         <tr>
-          <th>@mv.getLabel() @if(size > 1 || mv.getGroupId() != 0){(@mv.getGroupId())}</th>
+          <th>
+            <span @if(mv.getLabel().toUpperCase != mv.getName()){
+            data-rel="tooltip" title="" data-original-title="@mv.getName() @if(size > 1 || mv.getGroupId() != 0){(@mv.getGroupId())}"
+          }>@mv.getLabel() @if(size > 1 || mv.getGroupId() != 0){(@mv.getGroupId())}
+            </span>
+          </th>
           <td>
           @{
             mv.getName match {
diff --git a/conf/docker/permissions.yaml b/conf/docker/permissions.yaml
index a62b2ec08..d1218bd82 100644
--- a/conf/docker/permissions.yaml
+++ b/conf/docker/permissions.yaml
@@ -16,6 +16,8 @@ permissions:
     - "g=infra"
     - "g=ops"
     - "g=sre"
+  feature.canWriteEncryptedTags:
+    - "u=admins"
   controllers.Admin:
     - "g=infra"
     - "g=ops"
@@ -43,6 +45,12 @@ permissions:
     - "g=sre"
     - "u=admins"
     - "u=tools"
+  controllers.AssetApi.updateAssetStatus:
+    - "g=infra"
+    - "g=ops"
+    - "g=sre"
+    - "u=admins"
+    - "u=tools"
   controllers.AssetApi.updateAssetForMaintenance:
     - "g=infra"
     - "g=ops"
@@ -105,3 +113,15 @@ permissions:
     - "g=platform"
     - "u=admins"
     - "u=tools"
+  controllers.IpmiApi.updateIpmi:
+    - "g=infra"
+    - "g=ops"
+    - "g=sre"
+    - "u=admins"
+    - "u=tools"
+  controllers.Firehose.stream:
+    - "g=infra"
+    - "g=ops"
+    - "g=sre"
+    - "u=admins"
+    - "u=tools"
diff --git a/conf/reference/lldp_reference.conf b/conf/reference/lldp_reference.conf
index b9628a066..d92ea7b4f 100644
--- a/conf/reference/lldp_reference.conf
+++ b/conf/reference/lldp_reference.conf
@@ -2,4 +2,7 @@ lldp {
      # Refuse to accept lldp information with no name (aka
      # description)
      requireVlanName = true
+     # allow VLANs to omit vlan-id, to support odd devices and layer 2
+     # deployments
+     requireVlanId = false
 }
diff --git a/support/ruby/collins-client/Gemfile.lock b/support/ruby/collins-client/Gemfile.lock
new file mode 100644
index 000000000..b6d4cbab6
--- /dev/null
+++ b/support/ruby/collins-client/Gemfile.lock
@@ -0,0 +1,57 @@
+PATH
+  remote: .
+  specs:
+    collins_client (0.2.19)
+      httparty (~> 0.11.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    hashdiff (0.3.2)
+    httparty (0.11.0)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
+    json (2.0.3)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    public_suffix (2.0.5)
+    rake (10.5.0)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    safe_yaml (1.0.4)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    webmock (1.24.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    yard (0.9.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  collins_client!
+  rake (~> 10.4)
+  rspec (~> 2.99)
+  simplecov (~> 0.10)
+  webmock (~> 1.21)
+  yard (~> 0.8)
+
+BUNDLED WITH
+   1.13.6
diff --git a/support/ruby/collins-notify/collins_notify.gemspec b/support/ruby/collins-notify/collins_notify.gemspec
index 4f4b1c889..43473fe39 100644
--- a/support/ruby/collins-notify/collins_notify.gemspec
+++ b/support/ruby/collins-notify/collins_notify.gemspec
@@ -56,7 +56,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rdoc','~> 3.12')
   s.add_development_dependency('bundler','>= 1.2.0')
   s.add_development_dependency('simplecov','~> 0.9.1')
-  s.add_development_dependency('rake')
+  s.add_development_dependency('rake', '~> 10.5')
 
 end
 
diff --git a/support/ruby/collins-state/Gemfile.lock b/support/ruby/collins-state/Gemfile.lock
new file mode 100644
index 000000000..809f371d0
--- /dev/null
+++ b/support/ruby/collins-state/Gemfile.lock
@@ -0,0 +1,64 @@
+PATH
+  remote: .
+  specs:
+    collins_state (0.2.13)
+      collins_client (~> 0.2.7)
+      escape (~> 0.0.4)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    collins_client (0.2.19)
+      httparty (~> 0.11.0)
+    crack (0.4.3)
+      safe_yaml (~> 1.0.0)
+    diff-lcs (1.3)
+    docile (1.1.5)
+    escape (0.0.4)
+    hashdiff (0.3.2)
+    httparty (0.11.0)
+      multi_json (~> 1.0)
+      multi_xml (>= 0.5.2)
+    json (2.0.3)
+    multi_json (1.12.1)
+    multi_xml (0.6.0)
+    public_suffix (2.0.5)
+    rake (10.5.0)
+    redcarpet (3.4.0)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.99.4)
+    safe_yaml (1.0.4)
+    simplecov (0.13.0)
+      docile (~> 1.1.0)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    webmock (1.24.6)
+      addressable (>= 2.3.6)
+      crack (>= 0.3.2)
+      hashdiff
+    yard (0.8.7.6)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  collins_state!
+  rake (~> 10.5)
+  redcarpet (~> 3.2)
+  rspec (~> 2.99)
+  simplecov
+  webmock (~> 1.21)
+  yard (~> 0.8.7)
+
+BUNDLED WITH
+   1.13.6
diff --git a/support/ruby/collins-state/collins_state.gemspec b/support/ruby/collins-state/collins_state.gemspec
index 5229619fe..711a764d2 100644
--- a/support/ruby/collins-state/collins_state.gemspec
+++ b/support/ruby/collins-state/collins_state.gemspec
@@ -34,9 +34,9 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'escape', '~> 0.0.4'
 
   s.add_development_dependency 'rspec', '~> 2.99'
-  s.add_development_dependency 'yard'
-  s.add_development_dependency 'redcarpet'
-  s.add_development_dependency 'webmock'
+  s.add_development_dependency 'yard', '~> 0.8.7'
+  s.add_development_dependency 'redcarpet', '~> 3.2'
+  s.add_development_dependency 'webmock', '~> 1.21'
   s.add_development_dependency 'bundler'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'rake', '~> 10.5'
diff --git a/test/collins/util/parsers/LldpParserSpec.scala b/test/collins/util/parsers/LldpParserSpec.scala
index b5e9b9f26..8a26b9916 100644
--- a/test/collins/util/parsers/LldpParserSpec.scala
+++ b/test/collins/util/parsers/LldpParserSpec.scala
@@ -58,6 +58,21 @@ class LldpParserSpec extends mutable.Specification {
       }
     }
 
+    "missing vlan-id ok when !lldp.requireVlanId" in new LldpParserHelper("lldpctl-no-vlan-id.xml", Map("lldp.requireVlanId" -> "false")){
+      val parseResult = parsed()
+      parseResult must beRight
+      parseResult.right.toOption must beSome.which { rep =>
+        rep.interfaceCount mustEqual (1)
+        rep.vlanNames.toSet mustEqual (Set("fake"))
+        rep.vlanIds.toSet mustEqual (Set(0))
+      }
+    }
+    "missing vlan-id not ok when lldp.requireVlanId" in new LldpParserHelper("lldpctl-no-vlan-id.xml", Map("lldp.requireVlanId" -> "true")){
+      val parseResult = parsed()
+      parseResult must beLeft
+    }
+
+
     "Parse XML with four network interfaces" in new LldpParserHelper("lldpctl-four-nic.xml") {
       val parseResult = parsed()
       parseResult must beRight
@@ -74,6 +89,20 @@ class LldpParserSpec extends mutable.Specification {
       }
     }
 
+    "Parse XML with optional fields" in {
+      "Missing vlan-id" in new LldpParserHelper("lldpctl-bad.xml", Map("lldp.requireVlanId" -> "false")) {
+        // missing vlan-id is acceptable, for compatibility with odd switches that
+        // do not report a vlan-id despite being configured
+        val invalidXml = getResource(filename)
+        override def getParseResults(data: String): Either[Throwable, LldpRepresentation] = {
+          getParser(data).parse()
+        }
+        val s = """<vlan label="VLAN" vlan-id="106" pvid="yes">DFW-LOGGING</vlan>"""
+        val r = """<vlan label="VLAN" pvid="yes">DFW-LOGGING</vlan>"""
+        getParseResults(invalidXml.replace(s, r)) must beRight
+      }
+    }
+
     "Parse a generated XML file" in new LldpParserHelper("lldpctl-empty.xml") {
       parsed() must beRight
     }
@@ -163,15 +192,7 @@ class LldpParserSpec extends mutable.Specification {
         val r = """<vlan label="VLAN" vlan-id="106" pvid="yes"/>"""
         getParseResults(invalidXml.replace(s, r)) must beLeft
       }
-      "Missing vlan id" in new LldpParserHelper("lldpctl-bad.xml") {
-        val invalidXml = getResource(filename)
-        override def getParseResults(data: String): Either[Throwable, LldpRepresentation] = {
-          getParser(data).parse()
-        }
-        val s = """<vlan label="VLAN" vlan-id="106" pvid="yes">DFW-LOGGING</vlan>"""
-        val r = """<vlan label="VLAN" pvid="yes">DFW-LOGGING</vlan>"""
-        getParseResults(invalidXml.replace(s, r)) must beLeft
-      }
+      
     }
   }
 
diff --git a/test/collins/util/parsers/LshwParserSpec.scala b/test/collins/util/parsers/LshwParserSpec.scala
index 4c770cffd..71d59d571 100644
--- a/test/collins/util/parsers/LshwParserSpec.scala
+++ b/test/collins/util/parsers/LshwParserSpec.scala
@@ -50,7 +50,7 @@ class LshwParserSpec extends mutable.Specification {
 
           rep.base.product mustEqual "PowerEdge C6105 (N/A)"
           rep.base.vendor mustEqual "Winbond Electronics"
-          rep.base.serial mustEqual "FZ1NXQ1"
+          rep.base.serial.get mustEqual "FZ1NXQ1"
         }
       } // with a 10-gig card
 
@@ -386,6 +386,19 @@ class LshwParserSpec extends mutable.Specification {
 
     } // Parse softlayer supermicro (Intel) lshw output"
 
+    "Handle missing fields in LSHW" in {
+      "No base serial" in new LshwParserHelper("missing-base-serial.xml") {
+        val parseResults = parsed()
+        parseResults must beRight
+        parseResults.right.toOption must beSome.which { rep =>
+          rep.base.product mustEqual "Virtual Machine (None)"
+          rep.base.vendor mustEqual "Microsoft Corporation"
+          rep.base.serial mustEqual None
+          rep.base.description mustEqual "Desktop Computer"
+        }
+      }
+    }
+
     "Parse Dell LSHW Output" in {
       "R620 LSHW Output" in new LshwParserHelper("lshw-dell-r620-single-cpu.xml") {
         val parseResults = parsed()
diff --git a/test/resources/lldpctl-no-vlan-id.xml b/test/resources/lldpctl-no-vlan-id.xml
new file mode 100644
index 000000000..768263495
--- /dev/null
+++ b/test/resources/lldpctl-no-vlan-id.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lldp label="LLDP neighbors">
+ <interface label="Interface" name="eth0" via="LLDP" rid="1" age="0 day, 00:11:06">
+  <chassis label="Chassis">
+   <id label="ChassisID" type="mac">???</id>
+   <name label="SysName">system name</name>
+   <descr label="SysDescr">system desc</descr>
+   <capability label="Capability" type="Bridge" enabled="on"/>
+   <capability label="Capability" type="Router" enabled="on"/>
+  </chassis>
+  <port label="Port">
+   <id label="PortID" type="local">Port ID here</id>
+   <descr label="PortDescr">Port Description Here</descr>
+   <mfs label="MFS">1514</mfs>
+   <auto-negotiation label="PMD autoneg" supported="yes" enabled="yes">
+    <advertised label="Adv" type="40000Base-T" hd="yes" fd="yes"/>
+    <current label="MAU oper type">unknown</current>
+   </auto-negotiation>
+  </port>
+  <vlan label="VLAN" pvid="yes">fake</vlan>
+  <lldp-med label="LLDP-MED">
+   <device-type label="Device Type">Network Connectivity Device</device-type>
+   <capability label="Capability" type="Capabilities"/>
+   <capability label="Capability" type="Policy"/>
+   <capability label="Capability" type="Location"/>
+   <capability label="Capability" type="MDI/PSE"/>
+  </lldp-med>
+ </interface>
+</lldp>
diff --git a/test/resources/missing-base-serial.xml b/test/resources/missing-base-serial.xml
new file mode 100644
index 000000000..18eb4e6ca
--- /dev/null
+++ b/test/resources/missing-base-serial.xml
@@ -0,0 +1,259 @@
+<?xml version="1.0" standalone="yes" ?>
+<!-- generated by lshw-B.02.17 -->
+<!-- GCC 4.8.5 20150623 (Red Hat 4.8.5-4) -->
+<!-- Linux 3.10.0-327.22.2.el7.x86_64 #1 SMP Thu Jun 23 17:05:11 UTC 2016 x86_64 -->
+<!-- GNU libc 2 (glibc 2.17) -->
+<list>
+<node id="ABC-123" claimed="true" class="system" handle="DMI:0001">
+ <description>Desktop Computer</description>
+ <product>Virtual Machine (None)</product>
+ <vendor>Microsoft Corporation</vendor>
+ <version>Hyper-V UEFI Release v1.0</version>
+ <serial>0574-2207-1613-4261-5019-1454-34</serial>
+ <width units="bits">64</width>
+ <configuration>
+  <setting id="boot" value="normal" />
+  <setting id="chassis" value="desktop" />
+  <setting id="family" value="Virtual Machine" />
+  <setting id="sku" value="None" />
+  <setting id="uuid" value="893FC6A0-963E-584C-8B4D-4C6834C8E642" />
+ </configuration>
+ <capabilities>
+  <capability id="smbios-2.4" >SMBIOS version 2.4</capability>
+  <capability id="dmi-2.4" >DMI version 2.4</capability>
+  <capability id="vsyscall32" >32-bit processes</capability>
+ </capabilities>
+  <node id="core" claimed="true" class="bus" handle="DMI:0003">
+   <description>Motherboard</description>
+   <product>Virtual Machine</product>
+   <vendor>Microsoft Corporation</vendor>
+   <physid>0</physid>
+   <version>Hyper-V UEFI Release v1.0</version>
+   <serial>0574-2207-1613-4261-5019-1454-34</serial>
+   <slot>Virtual Machine</slot>
+    <node id="firmware" claimed="true" class="memory" handle="">
+     <description>BIOS</description>
+     <vendor>Microsoft Corporation</vendor>
+     <physid>0</physid>
+     <version>Hyper-V UEFI Release v1.0</version>
+     <date>11/26/2012</date>
+     <size units="bytes">1048576</size>
+     <capabilities>
+      <capability id="acpi" >ACPI</capability>
+     </capabilities>
+    </node>
+    <node id="cpu" claimed="true" class="processor" handle="DMI:0004">
+     <description>CPU</description>
+     <product>Xeon (None)</product>
+     <vendor>Intel Corp.</vendor>
+     <physid>4</physid>
+     <businfo>cpu@0</businfo>
+     <version>Intel(R) Xeon(R) CPU E5-2630 v3 @ 2.40GHz</version>
+     <serial>None</serial>
+     <slot>None</slot>
+     <size units="Hz">2400000000</size>
+     <capacity units="Hz">4000000000</capacity>
+     <width units="bits">64</width>
+     <clock units="Hz">3705032704</clock>
+     <capabilities>
+      <capability id="fpu" >mathematical co-processor</capability>
+      <capability id="fpu_exception" >FPU exceptions reporting</capability>
+      <capability id="wp" />
+      <capability id="vme" >virtual mode extensions</capability>
+      <capability id="de" >debugging extensions</capability>
+      <capability id="pse" >page size extensions</capability>
+      <capability id="tsc" >time stamp counter</capability>
+      <capability id="msr" >model-specific registers</capability>
+      <capability id="pae" >4GB+ memory addressing (Physical Address Extension)</capability>
+      <capability id="mce" >machine check exceptions</capability>
+      <capability id="cx8" >compare and exchange 8-byte</capability>
+      <capability id="apic" >on-chip advanced programmable interrupt controller (APIC)</capability>
+      <capability id="sep" >fast system calls</capability>
+      <capability id="mtrr" >memory type range registers</capability>
+      <capability id="pge" >page global enable</capability>
+      <capability id="mca" >machine check architecture</capability>
+      <capability id="cmov" >conditional move instruction</capability>
+      <capability id="pat" >page attribute table</capability>
+      <capability id="pse36" >36-bit page size extensions</capability>
+      <capability id="clflush" />
+      <capability id="mmx" >multimedia extensions (MMX)</capability>
+      <capability id="fxsr" >fast floating point save/restore</capability>
+      <capability id="sse" >streaming SIMD extensions (SSE)</capability>
+      <capability id="sse2" >streaming SIMD extensions (SSE2)</capability>
+      <capability id="ss" >self-snoop</capability>
+      <capability id="syscall" >fast system calls</capability>
+      <capability id="nx" >no-execute bit (NX)</capability>
+      <capability id="x86-64" >64bits extensions (x86-64)</capability>
+      <capability id="constant_tsc" />
+      <capability id="rep_good" />
+      <capability id="nopl" />
+      <capability id="eagerfpu" />
+      <capability id="pni" />
+      <capability id="pclmulqdq" />
+      <capability id="ssse3" />
+      <capability id="fma" />
+      <capability id="cx16" />
+      <capability id="sse4_1" />
+      <capability id="sse4_2" />
+      <capability id="movbe" />
+      <capability id="popcnt" />
+      <capability id="aes" />
+      <capability id="xsave" />
+      <capability id="avx" />
+      <capability id="f16c" />
+      <capability id="rdrand" />
+      <capability id="hypervisor" />
+      <capability id="lahf_lm" />
+      <capability id="abm" />
+      <capability id="fsgsbase" />
+      <capability id="bmi1" />
+      <capability id="avx2" />
+      <capability id="smep" />
+      <capability id="bmi2" />
+      <capability id="erms" />
+      <capability id="xsaveopt" />
+     </capabilities>
+    </node>
+    <node id="memory" claimed="true" class="memory" handle="DMI:0006">
+     <description>System Memory</description>
+     <physid>6</physid>
+     <slot>System board or motherboard</slot>
+     <size units="bytes">4294967296</size>
+      <node id="bank:0" claimed="true" class="memory" handle="DMI:0007">
+       <product>None</product>
+       <vendor>Microsoft Corporation</vendor>
+       <physid>0</physid>
+       <serial>None</serial>
+       <slot>M00</slot>
+       <size units="bytes">4160749568</size>
+      </node>
+      <node id="bank:1" claimed="true" class="memory" handle="DMI:000A">
+       <product>None</product>
+       <vendor>Microsoft Corporation</vendor>
+       <physid>1</physid>
+       <serial>None</serial>
+       <slot>M01</slot>
+       <size units="bytes">134217728</size>
+      </node>
+    </node>
+    <node id="scsi" claimed="true" class="storage" handle="">
+     <physid>1</physid>
+     <logicalname>scsi0</logicalname>
+      <node id="disk" claimed="true" class="disk" handle="GUID:f6dc42f4-c255-47a8-94cf-eb351588536d">
+       <description>SCSI Disk</description>
+       <physid>0.0.0</physid>
+       <businfo>scsi@0:0.0.0</businfo>
+       <logicalname>/dev/sda</logicalname>
+       <dev>8:0</dev>
+       <size units="bytes">53687091200</size>
+       <configuration>
+        <setting id="guid" value="f6dc42f4-c255-47a8-94cf-eb351588536d" />
+        <setting id="logicalsectorsize" value="512" />
+        <setting id="sectorsize" value="4096" />
+       </configuration>
+       <capabilities>
+        <capability id="gpt-1.00" >GUID Partition Table version 1.00</capability>
+        <capability id="partitioned" >Partitioned disk</capability>
+        <capability id="partitioned:gpt" >GUID partition table</capability>
+       </capabilities>
+        <node id="volume:0" class="volume" handle="GUID:b63580c3-869b-4acb-9089-9b5e6183d10e">
+         <description>Windows FAT volume</description>
+         <vendor>mkfs.fat</vendor>
+         <physid>1</physid>
+         <businfo>scsi@0:0.0.0,1</businfo>
+         <version>FAT16</version>
+         <serial>32c4-96a4</serial>
+         <size units="bytes">209714688</size>
+         <capacity>209714688</capacity>
+         <configuration>
+          <setting id="FATs" value="2" />
+          <setting id="filesystem" value="fat" />
+          <setting id="name" value="EFI System Partition" />
+         </configuration>
+         <capabilities>
+          <capability id="boot" >Contains boot code</capability>
+          <capability id="fat" >Windows FAT</capability>
+          <capability id="initialized" >initialized volume</capability>
+         </capabilities>
+        </node>
+        <node id="volume:1" class="volume" handle="GUID:c1747320-6774-47dc-8e61-104051115270">
+         <description>data partition</description>
+         <vendor>Windows</vendor>
+         <physid>2</physid>
+         <businfo>scsi@0:0.0.0,2</businfo>
+         <serial>c1747320-6774-47dc-8e61-104051115270</serial>
+         <capacity>524287488</capacity>
+        </node>
+        <node id="volume:2" claimed="true" class="volume" handle="GUID:4255502b-0cf7-4aaf-b651-b49b0af21155">
+         <description>LVM Physical Volume</description>
+         <vendor>Linux</vendor>
+         <physid>3</physid>
+         <businfo>scsi@0:0.0.0,3</businfo>
+         <logicalname>/dev/sda3</logicalname>
+         <dev>8:3</dev>
+         <serial>tpeGWj-gIj7-Xpa7-22j6-LqZf-qP6k-ayZLO1</serial>
+         <size units="bytes">52950990848</size>
+         <capabilities>
+          <capability id="multi" >Multi-volumes</capability>
+          <capability id="lvm2" />
+         </capabilities>
+        </node>
+      </node>
+      <node id="cdrom" claimed="true" class="disk" handle="SCSI:00:00:00:01">
+       <description>SCSI CD-ROM</description>
+       <physid>0.0.1</physid>
+       <businfo>scsi@0:0.0.1</businfo>
+       <logicalname>/dev/cdrom</logicalname>
+       <logicalname>/dev/sr0</logicalname>
+       <dev>11:0</dev>
+       <configuration>
+        <setting id="status" value="ready" />
+       </configuration>
+       <capabilities>
+        <capability id="audio" >Audio CD playback</capability>
+       </capabilities>
+      </node>
+    </node>
+  </node>
+  <node id="network:0" claimed="true" class="network" handle="">
+   <description>Ethernet interface</description>
+   <physid>1</physid>
+   <logicalname>veth7720825</logicalname>
+   <serial>e2:89:fc:fa:6c:2c</serial>
+   <size units="bit/s">10000000000</size>
+   <configuration>
+    <setting id="autonegotiation" value="off" />
+    <setting id="broadcast" value="yes" />
+    <setting id="driver" value="veth" />
+    <setting id="driverversion" value="1.0" />
+    <setting id="duplex" value="full" />
+    <setting id="link" value="yes" />
+    <setting id="multicast" value="yes" />
+    <setting id="port" value="twisted pair" />
+    <setting id="speed" value="10Gbit/s" />
+   </configuration>
+   <capabilities>
+    <capability id="ethernet" />
+    <capability id="physical" >Physical interface</capability>
+   </capabilities>
+  </node>
+  <node id="network:1" claimed="true" class="network" handle="">
+   <description>Ethernet interface</description>
+   <physid>2</physid>
+   <logicalname>eth0</logicalname>
+   <serial>00:1d:d8:b7:1e:e7</serial>
+   <configuration>
+    <setting id="broadcast" value="yes" />
+    <setting id="driver" value="hv_netvsc" />
+    <setting id="firmware" value="N/A" />
+    <setting id="ip" value="172.19.2.91" />
+    <setting id="link" value="yes" />
+    <setting id="multicast" value="yes" />
+   </configuration>
+   <capabilities>
+    <capability id="ethernet" />
+    <capability id="physical" >Physical interface</capability>
+   </capabilities>
+  </node>
+</node>
+</list>