diff --git a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
index 934f9b8ab..1ab7a8cdc 100644
--- a/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
+++ b/src/main/java/ru/dbotthepony/mc/otm/OverdriveThatMatters.java
@@ -122,7 +122,6 @@ public final class OverdriveThatMatters {
 		EVENT_BUS.addListener(EventPriority.NORMAL, ExplosionQueue.Companion::onWorldTick);
 		EVENT_BUS.addListener(EventPriority.NORMAL, AbstractWeaponItem.Companion::tick);
 		EVENT_BUS.addListener(EventPriority.NORMAL, QuantumBatteryItem.Companion::tick);
-		EVENT_BUS.addListener(EventPriority.NORMAL, QuantumBatteryItem.Companion::clientDisconnect);
 		EVENT_BUS.addListener(EventPriority.LOWEST, PortableCondensationDriveItem.Companion::onPickupEvent);
 
 		MatteryPlayerNetworkChannel.INSTANCE.register();
@@ -161,6 +160,8 @@ public final class OverdriveThatMatters {
 		EVENT_BUS.addListener(EventPriority.HIGHEST, ClientTickHandlerKt::onClientConnected);
 		EVENT_BUS.addListener(EventPriority.HIGHEST, ClientTickHandlerKt::onClientDisconnected);
 
+		EVENT_BUS.addListener(EventPriority.NORMAL, QuantumBatteryItem.Companion::clientDisconnect);
+
 		if (ModList.get().isLoaded("mekanism")) {
 			EVENT_BUS.addListener(EventPriority.NORMAL, TooltipsKt::tooltipEvent);
 		}
diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt
index 566125386..098fd9e99 100644
--- a/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt
+++ b/src/main/kotlin/ru/dbotthepony/mc/otm/android/AndroidSwitchableFeature.kt
@@ -23,6 +23,7 @@ abstract class AndroidSwitchableFeature(type: AndroidFeatureType<*>, android: Ma
 	open val allowToSwitchByPlayer: Boolean get() = true
 
 	// TODO: PoseStack is stripped from server dist
+	// but it doesn't seem to cause issues?
 	abstract fun renderIcon(stack: PoseStack, x: Float, y: Float, width: Float, height: Float)
 
 	override fun serializeNBT(): CompoundTag {