diff --git a/src/main/scala/li/cil/oc/common/init/Items.scala b/src/main/scala/li/cil/oc/common/init/Items.scala
index 963fabf54..4967da74f 100644
--- a/src/main/scala/li/cil/oc/common/init/Items.scala
+++ b/src/main/scala/li/cil/oc/common/init/Items.scala
@@ -127,7 +127,7 @@ object Items extends ItemAPI {
     val code = new Array[Byte](4 * 1024)
     val count = OpenComputers.getClass.getResourceAsStream(Settings.scriptPath + "bios.lua").read(code)
     data.setByteArray(Settings.namespace + "eeprom", code.take(count))
-    data.setString(Settings.namespace + "label", "Lua BIOS")
+    data.setString(Settings.namespace + "label", "EEPROM (Lua BIOS)")
 
     val nbt = new NBTTagCompound()
     nbt.setTag(Settings.namespace + "data", data)
diff --git a/src/main/scala/li/cil/oc/server/driver/Registry.scala b/src/main/scala/li/cil/oc/server/driver/Registry.scala
index 41b278f49..ba3a22f61 100644
--- a/src/main/scala/li/cil/oc/server/driver/Registry.scala
+++ b/src/main/scala/li/cil/oc/server/driver/Registry.scala
@@ -131,12 +131,14 @@ private[oc] object Registry extends api.detail.DriverAPI {
       case arg: Array[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
       case arg: Product => convertList(arg, arg.productIterator.zipWithIndex, memo)
       case arg: Seq[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
-      case arg: java.lang.Iterable[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
 
       case arg: Map[_, _] => convertMap(arg, arg, memo)
       case arg: mutable.Map[_, _] => convertMap(arg, arg.toMap, memo)
       case arg: java.util.Map[_, _] => convertMap(arg, arg.toMap, memo)
 
+      case arg: Iterable[_] => convertList(arg, arg.zipWithIndex.toIterator, memo)
+      case arg: java.lang.Iterable[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
+
       case arg =>
         val converted = new util.HashMap[AnyRef, AnyRef]()
         memo += arg -> converted