diff --git a/OpenRa.FileFormats/Map.cs b/OpenRa.FileFormats/Map.cs
index af857dc2a8..1fe7a8c71e 100644
--- a/OpenRa.FileFormats/Map.cs
+++ b/OpenRa.FileFormats/Map.cs
@@ -172,7 +172,7 @@ namespace OpenRa.FileFormats
 					newOverlay[i,j] = 0xff;
 					if (!HasOverlay(i, j) && r.NextDouble() < oreRate && GetOreDensity(i, j) > 0 && canSpreadIntoCell(new int2(i, j)) 
 					     )
-						newOverlay[i, j] = ChooseOre(); //(byte)r.Next(5, 9);
+						newOverlay[i, j] = ChooseOre();
 				}
 
 			for (int j = minj; j < maxj; j++)
diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index a9c66eff86..8d1e5f1dfa 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -138,7 +138,7 @@ namespace OpenRa.Game
 			lastTime = Environment.TickCount;
 		}
 
-		const int oreFrequency = 1;
+		const int oreFrequency = 30;
 		static int oreTicks = oreFrequency;
 		public static int RenderFrame = 0;
 		public static double RenderTime = 0.0;
diff --git a/OpenRa.Game/Traits/Harvester.cs b/OpenRa.Game/Traits/Harvester.cs
index a7988556c3..5681d1ff06 100644
--- a/OpenRa.Game/Traits/Harvester.cs
+++ b/OpenRa.Game/Traits/Harvester.cs
@@ -22,6 +22,8 @@ namespace OpenRa.Game.Traits
 
 		public Order Order(Actor self, int2 xy, bool lmb, Actor underCursor)
 		{
+			if (lmb) return null;
+
 			if (underCursor != null 
 				&& underCursor.Owner == self.Owner 
 				&& underCursor.traits.Contains<AcceptsOre>() && !IsEmpty)