diff --git a/clientmods/autoeat/init.lua b/clientmods/autoeat/init.lua
index 55aa8d9ec..ea1ee623e 100644
--- a/clientmods/autoeat/init.lua
+++ b/clientmods/autoeat/init.lua
@@ -31,6 +31,7 @@ minetest.register_globalstep(function()
 	elseif autoeat.eating then
 		last_step_eating = true
 	end
+
 	if not autoeat_timed then return end
 	if ( autofly.speed ~= 0 and minetest.settings:get_bool("autosprint") )
 	or (minetest.settings:get_bool("autosprintfsprint") and minetest.settings:get_bool("continuous_forward")  )
diff --git a/clientmods/autofly/init.lua b/clientmods/autofly/init.lua
index c27cf9151..7b669a843 100644
--- a/clientmods/autofly/init.lua
+++ b/clientmods/autofly/init.lua
@@ -232,6 +232,8 @@ end
 function autofly.arrived()
         minetest.settings:set("continuous_forward", "false")
         minetest.settings:set_bool("pitch_move",oldpm)
+        minetest.settings:set_bool("afly_autoaim",false)
+        minetest.settings:set_bool("autoeat_timed",false)
         core.set_keypress("special1", false)
         autofly.set_hud_info("Arrived at destination")
         minetest.localplayer:hud_change(hud_info,'text',twpname .. "\n" .. "Arrived at destination.")
diff --git a/clientmods/autofly/wpforms.lua b/clientmods/autofly/wpforms.lua
index 65f01e2b0..0c3d02791 100644
--- a/clientmods/autofly/wpforms.lua
+++ b/clientmods/autofly/wpforms.lua
@@ -26,7 +26,6 @@ function autofly.display_formspec()
                      'button[2.125,7.5;1.2,0.5;warpae;w+e]' ..
                      'button[2.625,7.5;1.3,0.5;rename;Rename]' ..
                      'button[3.9375,7.5;1.3,0.5;delete;Delete]' ..
-                     'image[50,50;100,100;"test"]'..
                      'textlist[0,0.75;5,6;marker;'
 
     -- Iterate over all the waypoints