diff --git a/Unity/Editor/EditorHelper.cs b/Unity/Editor/EditorHelper.cs
index 032e60b..645832d 100644
--- a/Unity/Editor/EditorHelper.cs
+++ b/Unity/Editor/EditorHelper.cs
@@ -22,7 +22,7 @@
 		{
 			if (Application.isEditor)
 			{
-				AbstractMap abstractMap = UnityEngine.Object.FindObjectOfType<AbstractMap>();
+				AbstractMap abstractMap = UnityEngine.Object.FindFirstObjectByType<AbstractMap>();
 
 				if (abstractMap == null)
 				{
@@ -286,4 +286,4 @@
 			return cnt;
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Unity/MeshGeneration/Factories/DirectionsFactory.cs b/Unity/MeshGeneration/Factories/DirectionsFactory.cs
index a465f45..38225e1 100644
--- a/Unity/MeshGeneration/Factories/DirectionsFactory.cs
+++ b/Unity/MeshGeneration/Factories/DirectionsFactory.cs
@@ -41,17 +41,15 @@ namespace Mapbox.Unity.MeshGeneration.Factories
 		private List<Vector3> _cachedWaypoints;
 		private Directions _directions;
 		private int _counter;
-		private bool _isDragging = false;
 		private Vector3[] _pointArray;
 		private Vector3 _pointUpDelta = new Vector3(0, 3, 0);
 		GameObject _directionsGO;
-		private bool _recalculateNext;
 
 		protected virtual void Awake()
 		{
 			if (_map == null)
 			{
-				_map = FindObjectOfType<AbstractMap>();
+				_map = FindFirstObjectByType<AbstractMap>();
 			}
 
 			_directions = MapboxAccess.Instance.Directions;
@@ -73,7 +71,6 @@ namespace Mapbox.Unity.MeshGeneration.Factories
 					ArrangingWaypointsStarted();
 					_lineRenderer.gameObject.SetActive(true);
 					_directionsGO.SetActive(false);
-					_isDragging = true;
 				};
 
 				wp.MouseDraging += () =>
@@ -91,7 +88,6 @@ namespace Mapbox.Unity.MeshGeneration.Factories
 				{
 					ArrangingWaypointsFinished();
 					_lineRenderer.gameObject.SetActive(false);
-					_isDragging = false;
 					Query();
 				};
 			}
@@ -105,7 +101,6 @@ namespace Mapbox.Unity.MeshGeneration.Factories
 				_cachedWaypoints.Add(item.position);
 			}
 
-			_recalculateNext = false;
 			_loftModifier.Initialize();
 		}
 
@@ -236,4 +231,4 @@ namespace Mapbox.Unity.MeshGeneration.Factories
 			}
 		}
 	}
-}
\ No newline at end of file
+}
diff --git a/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs b/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs
index bde4d0c..0919ac5 100644
--- a/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs
+++ b/Unity/MeshGeneration/Modifiers/MeshModifiers/ReplaceFeatureModifier.cs
@@ -92,7 +92,7 @@
 				}
 				if(_abstractMap == null)
 				{
-					_abstractMap = FindObjectOfType<AbstractMap>();
+					_abstractMap = FindFirstObjectByType<AbstractMap>();
 				}
 				if(_abstractMap != null)
 				{