diff --git a/li/cil/oc/Blocks.scala b/li/cil/oc/Blocks.scala
index a45c0dbd0..3a919e367 100644
--- a/li/cil/oc/Blocks.scala
+++ b/li/cil/oc/Blocks.scala
@@ -5,11 +5,14 @@ import li.cil.oc.common.block._
 object Blocks {
   var blockSimple: Delegator = null
   var blockSpecial: Delegator = null
+
   var computer: Computer = null
   var screen: Screen = null
   var keyboard: Keyboard = null
-  var powersupply: PowerSupply = null
-  var powerdistributor: PowerDistributor = null
+
+  var powerSupply: PowerSupply = null
+  var powerDistributor: PowerDistributor = null
+
   def init() {
     // IMPORTANT: the multi block must come first, since the sub blocks will
     // try to register with it. Also, the order the sub blocks are created in
@@ -20,7 +23,8 @@ object Blocks {
     computer = new Computer(blockSimple)
     screen = new Screen(blockSimple)
     keyboard = new Keyboard(blockSpecial)
-    powersupply = new PowerSupply(blockSimple)
-    powerdistributor = new PowerDistributor(blockSimple)
+
+    powerSupply = new PowerSupply(blockSimple)
+    powerDistributor = new PowerDistributor(blockSimple)
   }
 }
\ No newline at end of file
diff --git a/li/cil/oc/common/item/Hdd.scala b/li/cil/oc/common/item/Hdd.scala
index 1d2d874e4..55b03d76d 100644
--- a/li/cil/oc/common/item/Hdd.scala
+++ b/li/cil/oc/common/item/Hdd.scala
@@ -18,7 +18,7 @@ class Hdd(val parent: Delegator, val megaBytes: Int) extends Delegate {
         val nodeNbt = nbt.getCompoundTag("oc.node")
         if (nodeNbt.hasKey("address"))
           tooltip.add(nodeNbt.getString("address"))
-        if (nodeNbt.hasKey("fs")) {
+        if (advanced && nodeNbt.hasKey("fs")) {
           val fsNbt = nodeNbt.getCompoundTag("fs")
           if (fsNbt.hasKey("used")) {
             val used = fsNbt.getLong("used")