diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index ef9a869ba6..4e60cd1238 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -617,6 +617,7 @@ setting.difficulty.name = Difficulty:
 setting.screenshake.name = Screen Shake
 setting.effects.name = Display Effects
 setting.destroyedblocks.name = Display Destroyed Blocks
+setting.conveyorpathfinding.name = Conveyor Placement Pathfinding
 setting.sensitivity.name = Controller Sensitivity
 setting.saveinterval.name = Save Interval
 setting.seconds = {0} Seconds
diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java
index f738a1c083..8684dd268b 100644
--- a/core/src/io/anuke/mindustry/content/Mechs.java
+++ b/core/src/io/anuke/mindustry/content/Mechs.java
@@ -194,7 +194,7 @@ public class Mechs implements ContentList{
 
             @Override
             public void updateAlt(Player player){
-                float scl = 1f - player.shootHeat / 2f;
+                float scl = 1f - player.shootHeat / 2f*Time.delta();
                 player.velocity().scl(scl);
             }
 
diff --git a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
index aee06f9e31..6bea5404cb 100644
--- a/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
+++ b/core/src/io/anuke/mindustry/entities/bullet/MissileBulletType.java
@@ -36,7 +36,7 @@ public class MissileBulletType extends BasicBulletType{
         }
 
         if(weaveMag > 0){
-            b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, weaveScale, weaveMag));
+            b.velocity().rotate(Mathf.sin(Time.time() + b.id * 4422, weaveScale, weaveMag) * Time.delta());
         }
     }
 }
diff --git a/core/src/io/anuke/mindustry/input/Placement.java b/core/src/io/anuke/mindustry/input/Placement.java
index 14d1b8b230..35b078b8fe 100644
--- a/core/src/io/anuke/mindustry/input/Placement.java
+++ b/core/src/io/anuke/mindustry/input/Placement.java
@@ -1,5 +1,6 @@
 package io.anuke.mindustry.input;
 
+import io.anuke.arc.*;
 import io.anuke.arc.collection.*;
 import io.anuke.arc.math.*;
 import io.anuke.arc.math.geom.*;
@@ -26,7 +27,7 @@ public class Placement{
         Pools.freeAll(points);
 
         points.clear();
-        if(conveyors){
+        if(conveyors && Core.settings.getBool("conveyorpathfinding")){
             if(astar(startX, startY, endX, endY)){
                 return points;
             }else{
diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
index 5c2f479a0a..336c93eb6f 100644
--- a/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
+++ b/core/src/io/anuke/mindustry/ui/dialogs/SettingsMenuDialog.java
@@ -225,9 +225,8 @@ public class SettingsMenuDialog extends SettingsDialog{
         }
 
         game.checkPref("savecreate", true);
-
         game.checkPref("blockreplace", true);
-
+        game.checkPref("conveyorpathfinding", true);
         game.checkPref("hints", true);
 
         if(steam && !Version.modifier.contains("beta")){