diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
index 580069c9d..7b75b8828 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/ConstructorNetworkNode.java
@@ -243,7 +243,7 @@ public class ConstructorNetworkNode extends NetworkNode implements IComparable,
 
     @Override
     public IItemHandler getDrops() {
-        return upgrades;
+        return getUpgrades();
     }
 
     @Override
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java
index d7dd37643..72a95ef99 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/DestructorNetworkNode.java
@@ -207,19 +207,19 @@ public class DestructorNetworkNode extends NetworkNode implements IComparable, I
     }
 
     private ItemStack createTool() {
-        ItemStack tool = new ItemStack(Items.DIAMOND_PICKAXE);
+        ItemStack newTool = new ItemStack(Items.DIAMOND_PICKAXE);
 
         if (upgrades.hasUpgrade(UpgradeItem.Type.SILK_TOUCH)) {
-            tool.addEnchantment(Enchantments.SILK_TOUCH, 1);
+            newTool.addEnchantment(Enchantments.SILK_TOUCH, 1);
         } else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_3)) {
-            tool.addEnchantment(Enchantments.FORTUNE, 3);
+            newTool.addEnchantment(Enchantments.FORTUNE, 3);
         } else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_2)) {
-            tool.addEnchantment(Enchantments.FORTUNE, 2);
+            newTool.addEnchantment(Enchantments.FORTUNE, 2);
         } else if (upgrades.hasUpgrade(UpgradeItem.Type.FORTUNE_1)) {
-            tool.addEnchantment(Enchantments.FORTUNE, 1);
+            newTool.addEnchantment(Enchantments.FORTUNE, 1);
         }
 
-        return tool;
+        return newTool;
     }
 
     @Override
diff --git a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java
index 6846600cc..b384411d2 100644
--- a/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java
+++ b/src/main/java/com/refinedmods/refinedstorage/apiimpl/network/node/NetworkNode.java
@@ -61,7 +61,7 @@ public abstract class NetworkNode implements INetworkNode, INetworkNodeVisitor {
     private boolean couldUpdate;
     private int ticksSinceUpdateChanged;
 
-    public NetworkNode(World world, BlockPos pos) {
+    protected NetworkNode(World world, BlockPos pos) {
         if (world == null) {
             throw new IllegalArgumentException("World cannot be null");
         }
diff --git a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java
index e7c559f41..875d5226b 100644
--- a/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java
+++ b/src/main/java/com/refinedmods/refinedstorage/block/BaseBlock.java
@@ -9,7 +9,7 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public abstract class BaseBlock extends Block {
-    public BaseBlock(Properties properties) {
+    protected BaseBlock(Properties properties) {
         super(properties);
     }
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java
index 0497734a1..982d0bd10 100644
--- a/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java
+++ b/src/main/java/com/refinedmods/refinedstorage/block/NetworkNodeBlock.java
@@ -5,6 +5,7 @@ import com.refinedmods.refinedstorage.api.network.node.INetworkNodeProxy;
 import com.refinedmods.refinedstorage.apiimpl.API;
 import com.refinedmods.refinedstorage.apiimpl.network.node.NetworkNode;
 import com.refinedmods.refinedstorage.tile.NetworkNodeTile;
+import net.minecraft.block.AbstractBlock;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.inventory.InventoryHelper;
@@ -22,7 +23,7 @@ import net.minecraftforge.items.IItemHandler;
 public abstract class NetworkNodeBlock extends BaseBlock {
     public static final BooleanProperty CONNECTED = BooleanProperty.create("connected");
 
-    public NetworkNodeBlock(Block.Properties props) {
+    protected NetworkNodeBlock(AbstractBlock.Properties props) {
         super(props);
 
         if (hasConnectedState()) {
diff --git a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java
index a25c76e5c..2971aed61 100644
--- a/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java
+++ b/src/main/java/com/refinedmods/refinedstorage/container/BaseContainer.java
@@ -36,7 +36,7 @@ public abstract class BaseContainer extends Container {
     private final List<FluidFilterSlot> fluidSlots = new ArrayList<>();
     private final List<FluidStack> fluids = new ArrayList<>();
 
-    public BaseContainer(@Nullable ContainerType<?> type, @Nullable BaseTile tile, PlayerEntity player, int windowId) {
+    protected BaseContainer(@Nullable ContainerType<?> type, @Nullable BaseTile tile, PlayerEntity player, int windowId) {
         super(type, windowId);
 
         this.tile = tile;
diff --git a/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java b/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java
index fc430112e..2076d69cc 100644
--- a/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java
+++ b/src/main/java/com/refinedmods/refinedstorage/item/EnergyItem.java
@@ -22,7 +22,7 @@ public abstract class EnergyItem extends Item {
     private final Supplier<Integer> energyCapacity;
     private final boolean creative;
 
-    public EnergyItem(Item.Properties properties, boolean creative, Supplier<Integer> energyCapacity) {
+    protected EnergyItem(Item.Properties properties, boolean creative, Supplier<Integer> energyCapacity) {
         super(properties);
 
         this.creative = creative;
diff --git a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java
index 573f8981b..78e0bfe44 100644
--- a/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java
+++ b/src/main/java/com/refinedmods/refinedstorage/item/NetworkItem.java
@@ -29,7 +29,7 @@ public abstract class NetworkItem extends EnergyItem implements INetworkItemProv
     private static final String NBT_NODE_Z = "NodeZ";
     private static final String NBT_DIMENSION = "Dimension";
 
-    public NetworkItem(Item.Properties item, boolean creative, Supplier<Integer> energyCapacity) {
+    protected NetworkItem(Item.Properties item, boolean creative, Supplier<Integer> energyCapacity) {
         super(item, creative, energyCapacity);
     }
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java
index 37836019e..3dcb60fef 100644
--- a/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java
+++ b/src/main/java/com/refinedmods/refinedstorage/item/blockitem/EnergyBlockItem.java
@@ -23,7 +23,7 @@ public abstract class EnergyBlockItem extends BaseBlockItem {
     private final Supplier<Integer> energyCapacity;
     private final boolean creative;
 
-    public EnergyBlockItem(BaseBlock block, Item.Properties properties, boolean creative, Supplier<Integer> energyCapacity) {
+    protected EnergyBlockItem(BaseBlock block, Item.Properties properties, boolean creative, Supplier<Integer> energyCapacity) {
         super(block, properties);
 
         this.creative = creative;
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java
index fc848fc9e..e362deba9 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/AmountSpecifyingScreen.java
@@ -20,7 +20,7 @@ public abstract class AmountSpecifyingScreen<T extends Container> extends BaseSc
     protected Button okButton;
     protected Button cancelButton;
 
-    public AmountSpecifyingScreen(BaseScreen<T> parent, T container, int width, int height, PlayerInventory playerInventory, ITextComponent title) {
+    protected AmountSpecifyingScreen(BaseScreen<T> parent, T container, int width, int height, PlayerInventory playerInventory, ITextComponent title) {
         super(container, width, height, playerInventory, title);
 
         this.parent = parent;
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
index 0bbcc863f..ece2a7327 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/BaseScreen.java
@@ -53,7 +53,7 @@ public abstract class BaseScreen<T extends Container> extends ContainerScreen<T>
 
     private int sideButtonY;
 
-    public BaseScreen(T container, int xSize, int ySize, PlayerInventory inventory, ITextComponent title) {
+    protected BaseScreen(T container, int xSize, int ySize, PlayerInventory inventory, ITextComponent title) {
         super(container, inventory, title);
 
         this.xSize = xSize;
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java
index 0599f8e47..37f9cc309 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/grid/view/BaseGridView.java
@@ -21,7 +21,7 @@ public abstract class BaseGridView implements IGridView {
     private List<IGridStack> stacks = new ArrayList<>();
     protected final Map<UUID, IGridStack> map = new HashMap<>();
 
-    public BaseGridView(GridScreen screen, IGridSorter defaultSorter, List<IGridSorter> sorters) {
+    protected BaseGridView(GridScreen screen, IGridSorter defaultSorter, List<IGridSorter> sorters) {
         this.screen = screen;
         this.defaultSorter = defaultSorter;
         this.sorters = sorters;
diff --git a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java
index ea298ef17..822c38d25 100644
--- a/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java
+++ b/src/main/java/com/refinedmods/refinedstorage/screen/widget/sidebutton/SideButton.java
@@ -18,7 +18,7 @@ public abstract class SideButton extends Button {
 
     protected final BaseScreen<?> screen;
 
-    public SideButton(BaseScreen<?> screen) {
+    protected SideButton(BaseScreen<?> screen) {
         super(-1, -1, WIDTH, HEIGHT, StringTextComponent.EMPTY, NO_ACTION);
 
         this.screen = screen;
diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java
index ed2061df5..3fca5c2f4 100644
--- a/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java
+++ b/src/main/java/com/refinedmods/refinedstorage/tile/BaseTile.java
@@ -11,7 +11,7 @@ import net.minecraft.tileentity.TileEntityType;
 public abstract class BaseTile extends TileEntity {
     protected final TileDataManager dataManager = new TileDataManager(this);
 
-    public BaseTile(TileEntityType<?> tileType) {
+    protected BaseTile(TileEntityType<?> tileType) {
         super(tileType);
     }
 
diff --git a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java
index eec5b1538..21b799cd2 100644
--- a/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java
+++ b/src/main/java/com/refinedmods/refinedstorage/tile/NetworkNodeTile.java
@@ -29,7 +29,7 @@ public abstract class NetworkNodeTile<N extends NetworkNode> extends BaseTile im
 
     private final LazyOptional<INetworkNodeProxy<N>> networkNodeProxy = LazyOptional.of(() -> this);
 
-    public NetworkNodeTile(TileEntityType<?> tileType) {
+    protected NetworkNodeTile(TileEntityType<?> tileType) {
         super(tileType);
 
         dataManager.addWatchedParameter(REDSTONE_MODE);