diff --git a/src/main/java/com/reider745/api/Client.java b/src/main/java/com/reider745/api/ZoteOnly.java
similarity index 50%
rename from src/main/java/com/reider745/api/Client.java
rename to src/main/java/com/reider745/api/ZoteOnly.java
index dc9d884b..b2b561c8 100644
--- a/src/main/java/com/reider745/api/Client.java
+++ b/src/main/java/com/reider745/api/ZoteOnly.java
@@ -1,4 +1,4 @@
 package com.reider745.api;
 
-public @interface Client {
+public @interface ZoteOnly {
 }
diff --git a/src/main/java/com/reider745/hooks/RhinoOverrides.java b/src/main/java/com/reider745/hooks/RhinoOverrides.java
index deb3bede..0bcc10b5 100644
--- a/src/main/java/com/reider745/hooks/RhinoOverrides.java
+++ b/src/main/java/com/reider745/hooks/RhinoOverrides.java
@@ -8,7 +8,7 @@ import javassist.NotFoundException;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-
+import com.reider745.InnerCoreServer;
 import com.reider745.api.hooks.HookClass;
 import com.reider745.api.hooks.TypeHook;
 import com.reider745.api.hooks.annotation.Hooks;
@@ -34,8 +34,15 @@ public class RhinoOverrides implements HookClass {
         return new String[] { "java", "javax", "org", "com", "edu", "net", "android" };
     }
 
+    @Inject(className = "org.mozilla.javascript.ScriptRuntime", type = TypeHook.BEFORE_REPLACE)
+    public static void warnAboutNonJSObject(Object nonJSObject) {
+        if (InnerCoreServer.isDeveloperMode()) {
+            logger.debug("Missed Context.javaToJS() conversion: " + nonJSObject);
+        }
+    }
+
     @Inject(className = "cn.nukkit.utils.MainLogger", type = TypeHook.BEFORE_REPLACE)
-    public static void warning(MainLogger self, String message) {
+    public static void warning(MainLogger nukkitLogger, String message) {
         if (message == null || !message.startsWith("Ignoring InnerCorePacket from ")) {
             logger.warn(message);
         }
diff --git a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/NetworkJsAdapter.java b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/NetworkJsAdapter.java
index 78c11bd5..2f74befc 100644
--- a/src/main/java/com/zhekasmirnov/apparatus/multiplayer/NetworkJsAdapter.java
+++ b/src/main/java/com/zhekasmirnov/apparatus/multiplayer/NetworkJsAdapter.java
@@ -4,7 +4,6 @@ import com.zhekasmirnov.apparatus.adapter.innercore.game.Minecraft;
 import com.zhekasmirnov.apparatus.api.player.NetworkPlayerHandler;
 import com.zhekasmirnov.apparatus.api.player.NetworkPlayerRegistry;
 import com.zhekasmirnov.apparatus.job.JobExecutor;
-import com.zhekasmirnov.apparatus.multiplayer.client.ModdedClient;
 import com.zhekasmirnov.apparatus.multiplayer.mod.IdConversionMap;
 import com.zhekasmirnov.apparatus.multiplayer.server.ConnectedClient;
 import com.zhekasmirnov.apparatus.multiplayer.server.InitializationPacketException;
@@ -28,7 +27,7 @@ public class NetworkJsAdapter {
     }
 
     @Deprecated(since = "Zote")
-    public ModdedClient getClient() {
+    public com.zhekasmirnov.apparatus.multiplayer.client.ModdedClient getClient() {
         return network.getClient();
     }
 
@@ -54,18 +53,19 @@ public class NetworkJsAdapter {
         network.addClientInitializationPacket(name, sender, receiver);
     }
 
+    @SuppressWarnings("deprecation")
     public void addServerInitializationPacket(String name, Network.ServerInitializationPacketSender sender,
-            ModdedClient.OnPacketReceivedListener receiver) {
+            com.zhekasmirnov.apparatus.multiplayer.client.ModdedClient.OnPacketReceivedListener receiver) {
         network.addServerInitializationPacket(name, sender, receiver);
     }
 
     @Deprecated(since = "Zote")
-    public void addClientPacket(String name, ModdedClient.OnPacketReceivedListener listener, JobExecutor executor) {
+    public void addClientPacket(String name, com.zhekasmirnov.apparatus.multiplayer.client.ModdedClient.OnPacketReceivedListener listener, JobExecutor executor) {
         network.addClientPacket(name, listener, executor);
     }
 
     @Deprecated(since = "Zote")
-    public void addClientPacket(String name, ModdedClient.OnPacketReceivedListener listener) {
+    public void addClientPacket(String name, com.zhekasmirnov.apparatus.multiplayer.client.ModdedClient.OnPacketReceivedListener listener) {
         network.addClientPacket(name, listener);
     }
 
diff --git a/src/main/java/com/zhekasmirnov/mcpe161/InnerCore.java b/src/main/java/com/zhekasmirnov/mcpe161/InnerCore.java
index c0ea3e4a..7d431d74 100644
--- a/src/main/java/com/zhekasmirnov/mcpe161/InnerCore.java
+++ b/src/main/java/com/zhekasmirnov/mcpe161/InnerCore.java
@@ -13,7 +13,6 @@ import com.zhekasmirnov.horizon.runtime.logger.Logger;
 import com.zhekasmirnov.innercore.api.log.ICLog;
 import com.zhekasmirnov.innercore.api.log.ModLoaderEventHandler;
 import com.zhekasmirnov.innercore.api.mod.API;
-import com.zhekasmirnov.innercore.api.mod.ui.TextureSource;
 import com.zhekasmirnov.innercore.api.runtime.LoadingStage;
 import com.zhekasmirnov.innercore.mod.build.ModLoader;
 import com.zhekasmirnov.innercore.mod.resource.ResourcePackManager;
@@ -176,9 +175,10 @@ public class InnerCore {
         }
 
         @Override
+        @SuppressWarnings("deprecation")
         public void addGuiAssetsDirectory(ApparatusMod mod, File directory) {
             if (directory.isDirectory()) {
-                TextureSource.instance.loadDirectory(directory);
+                com.zhekasmirnov.innercore.api.mod.ui.TextureSource.instance.loadDirectory(directory);
             }
         }