diff --git a/src/client/camera.cpp b/src/client/camera.cpp
index 96461d63b..9ac5e1cc3 100644
--- a/src/client/camera.cpp
+++ b/src/client/camera.cpp
@@ -535,7 +535,7 @@ void Camera::update(LocalPlayer* player, f32 frametime, f32 tool_reload_ratio)
 		auto fov_was = m_draw_control.fov_add;
 		m_draw_control.fov_add = speed.dotProduct(m_camera_direction)/(BS*4);
 		if (m_draw_control.fov_add > fov_was + 1)
-			m_draw_control.fov_add = fov_was + ( m_draw_control.fov_add - fov_was) / 3;
+			m_draw_control.fov_add = std::max<float>(10.0,fov_was + ( m_draw_control.fov_add - fov_was) / 3);
 		else if (m_draw_control.fov_add < fov_was - 1)
 			m_draw_control.fov_add = fov_was - (fov_was - m_draw_control.fov_add) / 3;
 		m_curr_fov_degrees -= m_draw_control.fov_add;
diff --git a/src/client/clientmap.h b/src/client/clientmap.h
index 5b9ab91b5..9f9c551d7 100644
--- a/src/client/clientmap.h
+++ b/src/client/clientmap.h
@@ -163,9 +163,6 @@ class ClientMap : public Map, public scene::ISceneNode
 
 	void renderPostFx(CameraMode cam_mode);
 
-	// For debugging the status and position of MapBlocks
-	void renderBlockBoundaries(const std::map<v3pos_t, MapBlock*> & blocks);
-
 	// For debug printing
 	void PrintInfo(std::ostream &out) override;
 
diff --git a/util/autotest/auto.pl b/util/autotest/auto.pl
index e49c8db35..aa0eb64b3 100755
--- a/util/autotest/auto.pl
+++ b/util/autotest/auto.pl
@@ -696,7 +696,7 @@ ()
         ++$g->{keep_config};
         $config->{runner} =
             $config->{runner}
-          . ' ASAN_OPTIONS=abort_on_error=1 '
+          . ' env ASAN_OPTIONS=abort_on_error=1 '
           . $config->{gdb}
           . q{ -ex 'run' -ex 't a a bt' }
           . ($config->{gdb_stay} ? '' : q{ -ex 'cont' -ex 'quit' })