diff --git a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java
index b3dececc7a..2d324dabc2 100644
--- a/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java
+++ b/src/main/java/org/spongepowered/api/item/enchantment/EnchantmentType.java
@@ -27,6 +27,7 @@
 import net.kyori.adventure.text.ComponentLike;
 import org.spongepowered.api.block.entity.EnchantmentTable;
 import org.spongepowered.api.item.inventory.ItemStack;
+import org.spongepowered.api.item.inventory.ItemStackLike;
 import org.spongepowered.api.registry.DefaultedRegistryValue;
 import org.spongepowered.api.tag.EnchantmenTypeTags;
 import org.spongepowered.api.tag.Taggable;
@@ -82,22 +83,38 @@ public interface EnchantmentType extends DefaultedRegistryValue, ComponentLike,
     int maximumEnchantabilityForLevel(int level);
 
     /**
-     * Test if this enchantment type can be applied to an {@link ItemStack}.
+     * @deprecated Use {@link #canBeAppliedToStack(ItemStackLike)} instead,
+     */
+    @Deprecated(forRemoval = true)
+    default boolean canBeAppliedToStack(ItemStack stack) {
+        return this.canBeAppliedToStack((ItemStackLike) stack);
+    }
+
+    /**
+     * Test if this enchantment type can be applied to an {@link ItemStackLike}.
      *
      * @param stack The item stack to check
      * @return Whether this enchantment type can be applied
      */
-    boolean canBeAppliedToStack(ItemStack stack);
+    boolean canBeAppliedToStack(ItemStackLike stack);
+
+    /**
+     * @deprecated Use {@link #canBeAppliedToStack(ItemStackLike)} instead,
+     */
+    @Deprecated(forRemoval = true)
+    default boolean canBeAppliedByTable(ItemStack stack) {
+        return this.canBeAppliedByTable((ItemStackLike) stack);
+    }
 
     /**
-     * Test if this enchantment type can be applied to an {@link ItemStack} by
+     * Test if this enchantment type can be applied to an {@link ItemStackLike} by
      * the {@link EnchantmentTable}.
      *
      * @param stack Te item stack to check
      * @return Whether this enchantment type can be applied by the
      *     enchantment table
      */
-    boolean canBeAppliedByTable(ItemStack stack);
+    boolean canBeAppliedByTable(ItemStackLike stack);
 
     /**
      * Test if this enchantment type can be applied along with
diff --git a/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java b/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java
index a6d7370595..b57641df73 100644
--- a/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java
+++ b/src/main/java/org/spongepowered/api/item/merchant/TradeOffer.java
@@ -29,6 +29,7 @@
 import org.spongepowered.api.data.persistence.DataSerializable;
 import org.spongepowered.api.entity.living.Humanoid;
 import org.spongepowered.api.item.inventory.ItemStack;
+import org.spongepowered.api.item.inventory.ItemStackLike;
 import org.spongepowered.api.item.inventory.ItemStackSnapshot;
 import org.spongepowered.api.util.CopyableBuilder;
 
@@ -164,6 +165,14 @@ static Builder builder() {
      */
     interface Builder extends org.spongepowered.api.util.Builder<TradeOffer, Builder>, CopyableBuilder<TradeOffer, Builder>, DataBuilder<TradeOffer> {
 
+        /**
+         * @deprecated Use {@link #firstBuyingItem(ItemStackLike)} instead.
+         */
+        @Deprecated(forRemoval = true)
+        default Builder firstBuyingItem(ItemStack item) {
+            return this.firstBuyingItem((ItemStackLike) item);
+        }
+
         /**
          * <p>Sets the first selling item of the trade offer to be
          * generated.</p>
@@ -173,7 +182,15 @@ interface Builder extends org.spongepowered.api.util.Builder<TradeOffer, Builder
          * @param item The first item to buy
          * @return This builder
          */
-        Builder firstBuyingItem(ItemStack item);
+        Builder firstBuyingItem(ItemStackLike item);
+
+        /**
+         * @deprecated Use {@link #secondBuyingItem(ItemStackLike)} instead.
+         */
+        @Deprecated(forRemoval = true)
+        default Builder secondBuyingItem(ItemStack item) {
+            return this.secondBuyingItem((ItemStackLike) item);
+        }
 
         /**
          * Sets the second selling item of the trade offer to be generated.
@@ -181,7 +198,15 @@ interface Builder extends org.spongepowered.api.util.Builder<TradeOffer, Builder
          * @param item The second item to buy
          * @return This builder
          */
-        Builder secondBuyingItem(ItemStack item);
+        Builder secondBuyingItem(ItemStackLike item);
+
+        /**
+         * @deprecated Use {@link #sellingItem(ItemStackLike)} instead.
+         */
+        @Deprecated(forRemoval = true)
+        default Builder sellingItem(ItemStack item) {
+            return this.sellingItem((ItemStackLike) item);
+        }
 
         /**
          * Sets the selling item of the trade offer to be generated.
@@ -189,7 +214,7 @@ interface Builder extends org.spongepowered.api.util.Builder<TradeOffer, Builder
          * @param item The item to sell
          * @return This builder
          */
-        Builder sellingItem(ItemStack item);
+        Builder sellingItem(ItemStackLike item);
 
         /**
          * Sets the existing uses of the trade offer to be generated. A trade