diff --git a/src/main/java/refinedstorage/tile/TileBase.java b/src/main/java/refinedstorage/tile/TileBase.java
index 6293bae4d..20e17b6a2 100755
--- a/src/main/java/refinedstorage/tile/TileBase.java
+++ b/src/main/java/refinedstorage/tile/TileBase.java
@@ -41,9 +41,9 @@ public abstract class TileBase extends TileEntity implements ITickable {
     }
 
     public void setDirection(EnumFacing direction) {
-        markDirty();
-
         this.direction = direction;
+
+        markDirty();
     }
 
     public EnumFacing getDirection() {
diff --git a/src/main/java/refinedstorage/tile/TileConstructor.java b/src/main/java/refinedstorage/tile/TileConstructor.java
index 23c4fd8e7..3621f4397 100755
--- a/src/main/java/refinedstorage/tile/TileConstructor.java
+++ b/src/main/java/refinedstorage/tile/TileConstructor.java
@@ -67,9 +67,9 @@ public class TileConstructor extends TileMachine implements ICompareConfig {
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileController.java b/src/main/java/refinedstorage/tile/TileController.java
index d8002b76d..34a39e14b 100755
--- a/src/main/java/refinedstorage/tile/TileController.java
+++ b/src/main/java/refinedstorage/tile/TileController.java
@@ -284,6 +284,8 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
 
     public void addCraftingTask(ICraftingTask task) {
         craftingTasksToAdd.add(task);
+
+        markDirty();
     }
 
     public void addCraftingTask(CraftingPattern pattern) {
@@ -296,6 +298,8 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
 
     public void cancelCraftingTask(ICraftingTask task) {
         craftingTasksToCancel.add(task);
+
+        markDirty();
     }
 
     public List<CraftingPattern> getPatterns() {
@@ -593,9 +597,9 @@ public class TileController extends TileBase implements IEnergyReceiver, ISynchr
 
     @Override
     public void setRedstoneMode(RedstoneMode mode) {
-        markDirty();
-
         this.redstoneMode = mode;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileDestructor.java b/src/main/java/refinedstorage/tile/TileDestructor.java
index f6fd69f16..9f57bfc01 100755
--- a/src/main/java/refinedstorage/tile/TileDestructor.java
+++ b/src/main/java/refinedstorage/tile/TileDestructor.java
@@ -72,9 +72,9 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     @Override
@@ -85,6 +85,8 @@ public class TileDestructor extends TileMachine implements ICompareConfig, IMode
     @Override
     public void setMode(int mode) {
         this.mode = mode;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileDetector.java b/src/main/java/refinedstorage/tile/TileDetector.java
index c46cc509a..eccd0cd95 100755
--- a/src/main/java/refinedstorage/tile/TileDetector.java
+++ b/src/main/java/refinedstorage/tile/TileDetector.java
@@ -110,9 +110,9 @@ public class TileDetector extends TileMachine implements ICompareConfig {
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     public int getMode() {
@@ -120,9 +120,9 @@ public class TileDetector extends TileMachine implements ICompareConfig {
     }
 
     public void setMode(int mode) {
-        markDirty();
-
         this.mode = mode;
+
+        markDirty();
     }
 
     public int getAmount() {
@@ -130,9 +130,9 @@ public class TileDetector extends TileMachine implements ICompareConfig {
     }
 
     public void setAmount(int amount) {
-        markDirty();
-
         this.amount = amount;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileDiskDrive.java b/src/main/java/refinedstorage/tile/TileDiskDrive.java
index 41ff74263..402c49140 100755
--- a/src/main/java/refinedstorage/tile/TileDiskDrive.java
+++ b/src/main/java/refinedstorage/tile/TileDiskDrive.java
@@ -144,9 +144,9 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     @Override
@@ -157,6 +157,8 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
     @Override
     public void setMode(int mode) {
         this.mode = mode;
+
+        markDirty();
     }
 
     @Override
@@ -195,9 +197,9 @@ public class TileDiskDrive extends TileMachine implements IStorageProvider, ISto
     }
 
     public void setPriority(int priority) {
-        markDirty();
-
         this.priority = priority;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileExporter.java b/src/main/java/refinedstorage/tile/TileExporter.java
index 48ac1650e..04b38db57 100755
--- a/src/main/java/refinedstorage/tile/TileExporter.java
+++ b/src/main/java/refinedstorage/tile/TileExporter.java
@@ -66,9 +66,9 @@ public class TileExporter extends TileMachine implements ICompareConfig {
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileExternalStorage.java b/src/main/java/refinedstorage/tile/TileExternalStorage.java
index ce7f89699..ad4ebf808 100755
--- a/src/main/java/refinedstorage/tile/TileExternalStorage.java
+++ b/src/main/java/refinedstorage/tile/TileExternalStorage.java
@@ -247,9 +247,9 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     @Override
@@ -260,6 +260,8 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
     @Override
     public void setMode(int mode) {
         this.mode = mode;
+
+        markDirty();
     }
 
     @Override
@@ -268,9 +270,9 @@ public class TileExternalStorage extends TileMachine implements IStorageProvider
     }
 
     public void setPriority(int priority) {
-        markDirty();
-
         this.priority = priority;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileImporter.java b/src/main/java/refinedstorage/tile/TileImporter.java
index 39a6232fc..cc16b7ed1 100755
--- a/src/main/java/refinedstorage/tile/TileImporter.java
+++ b/src/main/java/refinedstorage/tile/TileImporter.java
@@ -86,9 +86,9 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     @Override
@@ -99,6 +99,8 @@ public class TileImporter extends TileMachine implements ICompareConfig, IModeCo
     @Override
     public void setMode(int mode) {
         this.mode = mode;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileInterface.java b/src/main/java/refinedstorage/tile/TileInterface.java
index a2f538d0e..0c1355bbe 100755
--- a/src/main/java/refinedstorage/tile/TileInterface.java
+++ b/src/main/java/refinedstorage/tile/TileInterface.java
@@ -106,9 +106,9 @@ public class TileInterface extends TileMachine implements ICompareConfig, ISided
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/TileStorage.java b/src/main/java/refinedstorage/tile/TileStorage.java
index 1be49cf7f..b52d137e0 100755
--- a/src/main/java/refinedstorage/tile/TileStorage.java
+++ b/src/main/java/refinedstorage/tile/TileStorage.java
@@ -49,10 +49,10 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
         }
 
         if (storage != null && storage.isDirty()) {
-            markDirty();
-
             storage.writeToNBT(storageTag);
             storage.markClean();
+
+            markDirty();
         }
     }
 
@@ -138,9 +138,9 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
 
     @Override
     public void setCompare(int compare) {
-        markDirty();
-
         this.compare = compare;
+
+        markDirty();
     }
 
     @Override
@@ -151,6 +151,8 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
     @Override
     public void setMode(int mode) {
         this.mode = mode;
+
+        markDirty();
     }
 
     @Override
@@ -197,9 +199,9 @@ public class TileStorage extends TileMachine implements IStorageProvider, IStora
     }
 
     public void setPriority(int priority) {
-        markDirty();
-
         this.priority = priority;
+
+        markDirty();
     }
 
     @Override
diff --git a/src/main/java/refinedstorage/tile/grid/TileGrid.java b/src/main/java/refinedstorage/tile/grid/TileGrid.java
index afed261dd..a33c81825 100755
--- a/src/main/java/refinedstorage/tile/grid/TileGrid.java
+++ b/src/main/java/refinedstorage/tile/grid/TileGrid.java
@@ -237,9 +237,9 @@ public class TileGrid extends TileMachine implements IGrid {
     }
 
     public void setSortingDirection(int sortingDirection) {
-        markDirty();
-
         this.sortingDirection = sortingDirection;
+
+        markDirty();
     }
 
     public int getSortingType() {
@@ -247,9 +247,9 @@ public class TileGrid extends TileMachine implements IGrid {
     }
 
     public void setSortingType(int sortingType) {
-        markDirty();
-
         this.sortingType = sortingType;
+
+        markDirty();
     }
 
     public int getSearchBoxMode() {
@@ -257,9 +257,9 @@ public class TileGrid extends TileMachine implements IGrid {
     }
 
     public void setSearchBoxMode(int searchBoxMode) {
-        markDirty();
-
         this.searchBoxMode = searchBoxMode;
+
+        markDirty();
     }
 
     @Override