diff --git a/src/main/java/anticope/rejects/mixin/TexturedRenderLayersMixin.java b/src/main/java/anticope/rejects/mixin/TexturedRenderLayersMixin.java
index 661fbb0..968b3c4 100644
--- a/src/main/java/anticope/rejects/mixin/TexturedRenderLayersMixin.java
+++ b/src/main/java/anticope/rejects/mixin/TexturedRenderLayersMixin.java
@@ -9,7 +9,7 @@ import org.spongepowered.asm.mixin.injection.ModifyVariable;
 
 @Mixin(TexturedRenderLayers.class)
 public class TexturedRenderLayersMixin {
-    @ModifyVariable(method = "getChestTexture(Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/block/enums/ChestType;Z)Lnet/minecraft/client/util/SpriteIdentifier;", at = @At("LOAD"), name = "christmas")
+    @ModifyVariable(method = "getChestTexture(Lnet/minecraft/block/entity/BlockEntity;Lnet/minecraft/block/enums/ChestType;Z)Lnet/minecraft/client/util/SpriteIdentifier;", at = @At("LOAD"), ordinal = 0)
     private static boolean chrsitmas(boolean christmas) {
         Rendering rendering = Modules.get().get(Rendering.class);
         if (rendering != null && rendering.chistmas())
diff --git a/src/main/java/anticope/rejects/modules/AutoGrind.java b/src/main/java/anticope/rejects/modules/AutoGrind.java
index fd119a1..168f123 100644
--- a/src/main/java/anticope/rejects/modules/AutoGrind.java
+++ b/src/main/java/anticope/rejects/modules/AutoGrind.java
@@ -1,8 +1,3 @@
-/*
- * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
- * Copyright (c) Meteor Development.
- */
-
 package anticope.rejects.modules;
 
 import anticope.rejects.MeteorRejectsAddon;
diff --git a/src/main/java/anticope/rejects/modules/AutoLogin.java b/src/main/java/anticope/rejects/modules/AutoLogin.java
index 3b00dba..28a4960 100644
--- a/src/main/java/anticope/rejects/modules/AutoLogin.java
+++ b/src/main/java/anticope/rejects/modules/AutoLogin.java
@@ -1,8 +1,3 @@
-/*
- * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
- * Copyright (c) Meteor Development.
- */
-
 package anticope.rejects.modules;
 
 import anticope.rejects.MeteorRejectsAddon;
@@ -63,7 +58,7 @@ public class AutoLogin extends Module {
 
     public AutoLogin() {
         super(MeteorRejectsAddon.CATEGORY, "auto-login", "Runs command when joining specified server.");
-        MeteorClient.EVENT_BUS.subscribe(new Listener());
+        runInMainMenu = true;
     }
 
     @Override
@@ -79,19 +74,17 @@ public class AutoLogin extends Module {
         return l;
     }
 
-    private class Listener {
-        @EventHandler
-        private void onGameJoined(GameJoinedEvent event) {
-            if (!isActive()) return;
-            String command = commands.get().getOrDefault("*", commands.get().get(Utils.getWorldName()));
-            if (command != null) {
-                timer.schedule(new TimerTask() {
-                    @Override
-                    public void run() {
-                        if (mc.player != null) ChatUtils.sendPlayerMsg(command);
-                    }
-                }, delay.get());
-            }
+    @EventHandler
+    private void onGameJoined(GameJoinedEvent event) {
+        if (!isActive()) return;
+        String command = commands.get().getOrDefault("*", commands.get().get(Utils.getWorldName()));
+        if (command != null) {
+            timer.schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    if (mc.player != null) ChatUtils.sendPlayerMsg(command);
+                }
+            }, delay.get());
         }
     }
 
diff --git a/src/main/java/anticope/rejects/settings/GameModeListSetting.java b/src/main/java/anticope/rejects/settings/GameModeListSetting.java
index f3d2353..2c6c033 100644
--- a/src/main/java/anticope/rejects/settings/GameModeListSetting.java
+++ b/src/main/java/anticope/rejects/settings/GameModeListSetting.java
@@ -1,8 +1,3 @@
-/*
- * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
- * Copyright (c) Meteor Development.
- */
-
 package anticope.rejects.settings;
 
 import meteordevelopment.meteorclient.settings.IVisible;
diff --git a/src/main/java/anticope/rejects/settings/StringMapSetting.java b/src/main/java/anticope/rejects/settings/StringMapSetting.java
index ae44d70..7d6fe9a 100644
--- a/src/main/java/anticope/rejects/settings/StringMapSetting.java
+++ b/src/main/java/anticope/rejects/settings/StringMapSetting.java
@@ -1,8 +1,3 @@
-/*
- * This file is part of the Meteor Client distribution (https://github.com/MeteorDevelopment/meteor-client).
- * Copyright (c) Meteor Development.
- */
-
 package anticope.rejects.settings;
 
 import meteordevelopment.meteorclient.gui.GuiTheme;