diff --git a/runelite-api/src/main/java/net/runelite/api/events/ItemContainerChanged.java b/runelite-api/src/main/java/net/runelite/api/events/ItemContainerChanged.java
index a46692f416..1b0a80fa4e 100644
--- a/runelite-api/src/main/java/net/runelite/api/events/ItemContainerChanged.java
+++ b/runelite-api/src/main/java/net/runelite/api/events/ItemContainerChanged.java
@@ -28,7 +28,7 @@ import net.runelite.api.ItemContainer;
 import lombok.Value;
 
 /**
- * An event called whenever the stack size of an {@link api.Item}
+ * An event called whenever the stack size of an {@link net.runelite.api.Item}
  * in an {@link ItemContainer} is modified.
  * <p>
  * Examples of when this event may trigger include:
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
index 176eb708db..89115daa29 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPlugin.java
@@ -706,7 +706,7 @@ public class ItemsKeptOnDeathPlugin extends Plugin
 	{
 		final int id = item.getId();
 		final int qty = item.getQty();
-		final ItemDefinition c = itemManager.getItemComposition(id);
+		final ItemDefinition c = itemManager.getItemDefinition(id);
 
 		final Widget itemWidget = parent.createChild(-1, WidgetType.GRAPHIC);
 		itemWidget.setOriginalWidth(Constants.ITEM_SPRITE_WIDTH);
diff --git a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
index 1bc2141c06..185545ba27 100644
--- a/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
+++ b/runelite-client/src/main/java/net/runelite/client/plugins/keyremapping/KeyRemappingListener.java
@@ -45,6 +45,9 @@ class KeyRemappingListener extends MouseAdapter implements KeyListener
 	@Inject
 	private KeyRemappingPlugin plugin;
 
+	@Inject
+	private KeyRemappingConfig config;
+
 	@Inject
 	private Client client;
 
diff --git a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java
index 37e8a7d99d..4025ccf1b7 100644
--- a/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java
+++ b/runelite-client/src/test/java/net/runelite/client/plugins/itemskeptondeath/ItemsKeptOnDeathPluginTest.java
@@ -33,7 +33,7 @@ import java.util.Collections;
 import java.util.List;
 import net.runelite.api.Client;
 import net.runelite.api.Item;
-import net.runelite.api.ItemComposition;
+import net.runelite.api.ItemDefinition;
 import net.runelite.api.ItemID;
 import net.runelite.client.game.ItemManager;
 import static net.runelite.client.plugins.itemskeptondeath.ItemsKeptOnDeathPlugin.DeathItems;
@@ -80,7 +80,7 @@ public class ItemsKeptOnDeathPluginTest
 	private Item mItem(final int id, final int qty, final String name, final boolean tradeable, final int price)
 	{
 		// Mock Item Composition and necessary ItemManager methods for this item
-		ItemComposition c = mock(ItemComposition.class);
+		ItemDefinition c = mock(ItemDefinition.class);
 		when(c.getId())
 			.thenReturn(id);
 		when(c.getName())
@@ -96,7 +96,7 @@ public class ItemsKeptOnDeathPluginTest
 			when(c.getLinkedNoteId()).thenReturn(-1);
 		}
 
-		when(itemManager.getItemComposition(id)).thenReturn(c);
+		when(itemManager.getItemDefinition(id)).thenReturn(c);
 		when(itemManager.canonicalize(id)).thenReturn(id);
 		when(itemManager.getItemPrice(id, true)).thenReturn(price);
 
diff --git a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java
index 74c1bf29a3..f3505f1b80 100644
--- a/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java
+++ b/runelite-mixins/src/main/java/net/runelite/mixins/RSItemContainerMixin.java
@@ -64,7 +64,7 @@ public abstract class RSItemContainerMixin implements RSItemContainer
 
 	@FieldHook("quantities")
 	@Inject
-	public void stackSizesChanged(int idx)
+	public void stackSizesChanged(int containerID)
 	{
 		int cycle = client.getGameCycle();
 		if (rl$lastCycle == cycle)
@@ -75,7 +75,7 @@ public abstract class RSItemContainerMixin implements RSItemContainer
 
 		rl$lastCycle = cycle;
 
-		ItemContainerChanged event = new ItemContainerChanged(this);
+		ItemContainerChanged event = new ItemContainerChanged(containerID, this);
 		client.getCallbacks().postDeferred(event);
 	}