diff --git a/src/main/java/li/cil/oc/api/fs/Label.java b/src/main/java/li/cil/oc/api/fs/Label.java
index 475d70bec..e98e45cdb 100644
--- a/src/main/java/li/cil/oc/api/fs/Label.java
+++ b/src/main/java/li/cil/oc/api/fs/Label.java
@@ -1,11 +1,13 @@
 package li.cil.oc.api.fs;
 
+import li.cil.oc.api.Persistable;
+
 /**
  * Used by file system components to get and set the file system's label.
  *
  * @see li.cil.oc.api.FileSystem#asManagedEnvironment(FileSystem, Label)
  */
-public interface Label {
+public interface Label extends Persistable {
     /**
      * Get the current value of this label.
      * <p/>
diff --git a/src/main/java/li/cil/oc/api/package-info.java b/src/main/java/li/cil/oc/api/package-info.java
index 49ff8516f..366b2ed04 100644
--- a/src/main/java/li/cil/oc/api/package-info.java
+++ b/src/main/java/li/cil/oc/api/package-info.java
@@ -37,5 +37,5 @@
 @cpw.mods.fml.common.API(
         owner = "OpenComputers|Core",
         provides = "OpenComputersAPI",
-        apiVersion = "1.3.0")
+        apiVersion = "1.4.0")
 package li.cil.oc.api;
\ No newline at end of file
diff --git a/src/main/java/li/cil/oc/common/tileentity/Robot.scala b/src/main/java/li/cil/oc/common/tileentity/Robot.scala
index 054811d5b..7efc967eb 100644
--- a/src/main/java/li/cil/oc/common/tileentity/Robot.scala
+++ b/src/main/java/li/cil/oc/common/tileentity/Robot.scala
@@ -489,7 +489,7 @@ class Robot(isRemote: Boolean) extends Computer(isRemote) with ISidedInventory w
 
   // ----------------------------------------------------------------------- //
 
-  override def installedMemory = 96 * 1024
+  override def installedMemory = 128 * 1024
 
   override def tier = 0
 
diff --git a/src/main/java/li/cil/oc/server/component/FileSystem.scala b/src/main/java/li/cil/oc/server/component/FileSystem.scala
index 282f4ceae..2001b763f 100644
--- a/src/main/java/li/cil/oc/server/component/FileSystem.scala
+++ b/src/main/java/li/cil/oc/server/component/FileSystem.scala
@@ -245,6 +245,7 @@ class FileSystem(val fileSystem: IFileSystem, var label: Label) extends ManagedC
       }
     })
 
+    label.load(nbt.getCompoundTag("label"))
     fileSystem.load(nbt.getCompoundTag("fs"))
   }
 
@@ -264,6 +265,7 @@ class FileSystem(val fileSystem: IFileSystem, var label: Label) extends ManagedC
     }
     nbt.setTag("owners", ownersNbt)
 
+    nbt.setNewCompoundTag("label", label.save)
     nbt.setNewCompoundTag("fs", fileSystem.save)
   }
 
diff --git a/src/main/java/li/cil/oc/server/driver/item/FileSystem.scala b/src/main/java/li/cil/oc/server/driver/item/FileSystem.scala
index e6e601442..474ab300e 100644
--- a/src/main/java/li/cil/oc/server/driver/item/FileSystem.scala
+++ b/src/main/java/li/cil/oc/server/driver/item/FileSystem.scala
@@ -72,17 +72,32 @@ object FileSystem extends Item {
     override def setLabel(value: String) {
       media.setLabel(stack, value)
     }
+
+    override def load(nbt: NBTTagCompound) {}
+
+    override def save(nbt: NBTTagCompound) {}
   }
 
   private class ItemLabel(val stack: ItemStack) extends Label {
-    override def getLabel =
-      if (dataTag(stack).hasKey(Settings.namespace + "fs.label"))
-        dataTag(stack).getString(Settings.namespace + "fs.label")
-      else null
+    var label: Option[String] = None
+
+    override def getLabel = label.orNull
 
     override def setLabel(value: String) {
-      dataTag(stack).setString(Settings.namespace + "fs.label",
-        if (value.length > 16) value.substring(0, 16) else value)
+      label = Option(if (value != null && value.length > 16) value.substring(0, 16) else value)
+    }
+
+    override def load(nbt: NBTTagCompound) {
+      if (dataTag(stack).hasKey(Settings.namespace + "fs.label")) {
+        label = Option(dataTag(stack).getString(Settings.namespace + "fs.label"))
+      }
+    }
+
+    override def save(nbt: NBTTagCompound) {
+      label match {
+        case Some(value) => dataTag(stack).setString(Settings.namespace + "fs.label", value)
+        case _ =>
+      }
     }
   }
 
diff --git a/src/main/java/li/cil/oc/server/fs/FileSystem.scala b/src/main/java/li/cil/oc/server/fs/FileSystem.scala
index 178ab2a8e..8442a8d3a 100644
--- a/src/main/java/li/cil/oc/server/fs/FileSystem.scala
+++ b/src/main/java/li/cil/oc/server/fs/FileSystem.scala
@@ -8,6 +8,7 @@ import li.cil.oc.api.fs.Label
 import li.cil.oc.server.component
 import li.cil.oc.{Settings, api}
 import net.minecraftforge.common.DimensionManager
+import net.minecraft.nbt.NBTTagCompound
 
 object FileSystem extends api.detail.FileSystemAPI {
   override def fromClass(clazz: Class[_], domain: String, root: String): api.fs.FileSystem = {
@@ -84,6 +85,10 @@ object FileSystem extends api.detail.FileSystemAPI {
     def setLabel(value: String) = throw new IllegalArgumentException("label is read only")
 
     def getLabel = label
+
+    override def load(nbt: NBTTagCompound) {}
+
+    override def save(nbt: NBTTagCompound) {}
   }
 
   private class ReadOnlyFileSystem(protected val root: io.File)
diff --git a/src/main/resources/assets/opencomputers/lua/rom/lib/filesystem.lua b/src/main/resources/assets/opencomputers/lua/rom/lib/filesystem.lua
index b5a40d7c5..b01472b7b 100644
--- a/src/main/resources/assets/opencomputers/lua/rom/lib/filesystem.lua
+++ b/src/main/resources/assets/opencomputers/lua/rom/lib/filesystem.lua
@@ -474,7 +474,7 @@ function filesystem.open(path, mode)
 
   local function cleanup(self)
     if not self.handle then return end
-    self.fs.close(self.handle)
+    pcall(self.fs.close, self.handle)
   end
   local metatable = {__index = fileStream,
                      __gc = cleanup,