diff --git a/farms/farmer.lua b/farms/farmer.lua
index 1a94f74..42391c1 100644
--- a/farms/farmer.lua
+++ b/farms/farmer.lua
@@ -203,9 +203,9 @@ local s, m = turtle.run(function()
   local facing = scanner.getBlockMeta(0, 0, 0).state.facing
   turtle.point.heading = Point.facings[facing].heading
 
+  turtle.setStatus(string.format('Farming (fuel: %s)', Util.toBytes(turtle.getFuelLevel())))
   print('Fuel: ' .. turtle.getFuelLevel())
 
-  --turtle.setPolicy('digOnly')
   turtle.setMovementStrategy('goto')
   repeat
     local blocks, harvestCount = scan()
@@ -216,6 +216,7 @@ local s, m = turtle.run(function()
     end
     os.sleep(10)
     if turtle.getFuelLevel() < 10 then
+      turtle.setStatus('Out of fuel')
       error('Out of fuel')
     end
   until turtle.isAborted()
diff --git a/milo/apps/water.lua b/milo/apps/water.lua
index 79f985d..f229ce2 100644
--- a/milo/apps/water.lua
+++ b/milo/apps/water.lua
@@ -17,7 +17,7 @@ while true do
 	turtle.placeDown('minecraft:bucket:0')
 	turtle.placeDown('minecraft:glass_bottle:0')
 	for k,v in pairs(turtle.getInventory()) do
-		if v.name == 'minecraft:concrete_powder' then
+		if v.name == 'minecraft:concrete_powder' or v.name == 'minecraft:gravel' then
 			turtle.select(k)
 			for _ = 1, v.count do
 				turtle.placeDown()
diff --git a/monitor/mwm.lua b/monitor/mwm.lua
index 2858942..89cc259 100644
--- a/monitor/mwm.lua
+++ b/monitor/mwm.lua
@@ -1,5 +1,5 @@
 local injector = _G.requireInjector or load(http.get('https://raw.githubusercontent.com/kepler155c/opus/develop/sys/apis/injector.lua').readAll())()
-injector()
+injector(_ENV)
 
 local Canvas = require('ui.canvas')
 local Util   = require('util')