diff --git a/CHANGELOG.md b/CHANGELOG.md
index 368cefc73..6792a0c98 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Refined Storage Changelog
 
+### 1.8
+- Port to Minecraft 1.15 (raoulvdberge)
+
 ### 1.7.3
 - Fixed severe energy update lag introduced by version 1.7.2 (raoulvdberge)
 
diff --git a/build.gradle b/build.gradle
index b68e04e4f..33942d103 100755
--- a/build.gradle
+++ b/build.gradle
@@ -99,9 +99,9 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1:api")
     runtimeOnly fg.deobf("mezz.jei:jei-1.15.1:6.0.0.1")
 
-    //compileOnly 'mouse-tweaks:MouseTweaks:2.12:mc1.14.4'
+    compileOnly 'mouse-tweaks:MouseTweaks:2.13:mc1.15.1'
 
-    //runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.14.4:10.1.3')
+    runtimeOnly fg.deobf('crafting-tweaks:CraftingTweaks_1.15.1:11.0.0')
 }
 
 jar {
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java
index 292965843..f474114b3 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/StorageMonitorNetworkNode.java
@@ -77,7 +77,7 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl
         Pair<ItemStack, Long> deposit = deposits.get(player.getGameProfile().getName());
 
         if (deposit == null) {
-            return ActionResultType.FAIL; // TODO correct?
+            return ActionResultType.FAIL;
         }
 
         ItemStack inserted = deposit.getKey();
@@ -98,11 +98,11 @@ public class StorageMonitorNetworkNode extends NetworkNode implements IComparabl
 
     public ActionResultType deposit(PlayerEntity player, ItemStack toInsert) {
         if (network == null) {
-            return ActionResultType.FAIL; // TODO Correct?
+            return ActionResultType.FAIL;
         }
 
         if (!network.getSecurityManager().hasPermission(Permission.INSERT, player)) {
-            return ActionResultType.FAIL; // TODO Correct?
+            return ActionResultType.FAIL;
         }
 
         ItemStack filter = itemFilter.getStackInSlot(0);
diff --git a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java b/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java
index 55d393b12..03a49a447 100644
--- a/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java
+++ b/src/main/java/com/raoulvdberge/refinedstorage/screen/CrafterManagerScreen.java
@@ -18,11 +18,11 @@ import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.container.Slot;
 import net.minecraft.util.text.ITextComponent;
-import org.lwjgl.glfw.GLFW;
+import yalter.mousetweaks.api.MouseTweaksDisableWheelTweak;
 
 import java.util.Map;
 
-// TODO @MouseTweaksDisableWheelTweak
+@MouseTweaksDisableWheelTweak
 public class CrafterManagerScreen extends BaseScreen<CrafterManagerContainer> implements IScreenInfoProvider {
     private CrafterManagerNetworkNode crafterManager;