diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index e379e1cbfc..7eedff8df2 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -34,7 +34,7 @@ public class Vars{
 	//save file directory
 	public static final FileHandle saveDirectory = Gdx.files.local("mindustry-saves/");
 	//scale of the font
-	public static float fontscale = Unit.dp.inPixels(1f)/2f;
+	public static float fontscale = Math.max(Unit.dp.inPixels(1f)/2f, 0.5f);
 	//camera zoom displayed on startup
 	public static final int baseCameraScale = Math.round(Unit.dp.inPixels(4));
 	//how much the zoom changes every zoom button press
diff --git a/core/src/io/anuke/mindustry/mapeditor/MapEditor.java b/core/src/io/anuke/mindustry/mapeditor/MapEditor.java
index 6d1feb782f..8281410fe2 100644
--- a/core/src/io/anuke/mindustry/mapeditor/MapEditor.java
+++ b/core/src/io/anuke/mindustry/mapeditor/MapEditor.java
@@ -75,17 +75,12 @@ public class MapEditor{
 		int y = dy - dstHeight/2;
 		
 		if (x + dstWidth > width){
-			//x = width - dstWidth;
-			dstWidth = width - x;
+			x = width - dstWidth;
 		}else if (x < 0){
-			dstWidth += x;
 			x = 0;
 		}
 		
-		//System.out.println(x + " " + y + " " + dstWidth + " " + dstHeight);
-
 		if (y + dstHeight > height){
-			//y = height - dstHeight;
 			dstHeight = height - y;
 		}else if (y < 0){
 			dstHeight += y;
diff --git a/core/src/io/anuke/mindustry/mapeditor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/mapeditor/MapGenerateDialog.java
new file mode 100644
index 0000000000..7029ed1546
--- /dev/null
+++ b/core/src/io/anuke/mindustry/mapeditor/MapGenerateDialog.java
@@ -0,0 +1,5 @@
+package io.anuke.mindustry.mapeditor;
+
+public class MapGenerateDialog{
+
+}
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
index ed64f22235..49944067e3 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/distribution/TunnelConveyor.java
@@ -13,6 +13,7 @@ public class TunnelConveyor extends Block{
 		rotate = true;
 		update = true;
 		solid = true;
+		health = 70;
 	}
 	
 	@Override
@@ -38,7 +39,7 @@ public class TunnelConveyor extends Block{
 		Tile tunnel = getDestTunnel(dest);
 		if(tunnel != null){
 			Tile to = tunnel.getNearby()[tunnel.getRotation()];
-			return to != null && to.block().acceptItem(item, to, tunnel);
+			return to != null && !(to.block() instanceof TunnelConveyor) && to.block().acceptItem(item, to, tunnel);
 		}else{
 			return false;
 		}