diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java
index 8eea53fb6..ec5f2a281 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileCable.java
@@ -53,7 +53,7 @@ private class CableElement extends WiredModemElement
         @Override
         public Level getLevel()
         {
-            return this.getLevel();
+            return TileCable.this.getLevel();
         }
 
         @Nonnull
@@ -166,9 +166,9 @@ public void invalidateCaps()
     }
 
     @Override
-    public void onLoad()
+    public void clearRemoved()
     {
-        super.onLoad();
+        super.clearRemoved(); // TODO: Replace with onLoad
         TickScheduler.schedule( this );
     }
 
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java
index 82eab1d71..c5bdd8dfc 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wired/TileWiredModemFull.java
@@ -251,9 +251,9 @@ private void updateBlockState()
     }
 
     @Override
-    public void onLoad()
+    public void clearRemoved()
     {
-        super.onLoad();
+        super.clearRemoved(); // TODO: Replace with onLoad
         TickScheduler.schedule( this );
     }
 
diff --git a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java
index 8647c1248..c12950edd 100644
--- a/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java
+++ b/src/main/java/dan200/computercraft/shared/peripheral/modem/wireless/TileWirelessModem.java
@@ -80,9 +80,9 @@ public TileWirelessModem( BlockEntityType<? extends TileWirelessModem> type, Blo
     }
 
     @Override
-    public void onLoad()
+    public void clearRemoved()
     {
-        super.onLoad();
+        super.clearRemoved(); // TODO: Replace with onLoad
         TickScheduler.schedule( this );
     }