diff --git a/Assets/CollisionTags.SHConfig b/Assets/CollisionTags.SHConfig
index 18a339dd..d3ebe7e2 100644
--- a/Assets/CollisionTags.SHConfig
+++ b/Assets/CollisionTags.SHConfig
@@ -1,20 +1,16 @@
-0 	1
-1 	2
-2 	3
-3 	4
-4 	5
-5 	6
-6 	7
-7 	8
-8 	9
-9 	10
-10 	11
-11 	12
-12 	13
-13 	14
-14 	15
-15 	16
-
-note: 
-All collision tags should follow the above format "index<space>tag name". 
-If it fails to follow this, the default tag names will be used.
\ No newline at end of file
+0 1
+1 2
+2 3
+3 4
+4 5
+5 6
+6 7
+7 8
+8 9
+9 10
+10 11
+11 12
+12 13
+13 14
+14 15
+15 16
diff --git a/SHADE_Engine/src/Camera/SHCameraDirector.cpp b/SHADE_Engine/src/Camera/SHCameraDirector.cpp
index ec539fa1..29e2dcde 100644
--- a/SHADE_Engine/src/Camera/SHCameraDirector.cpp
+++ b/SHADE_Engine/src/Camera/SHCameraDirector.cpp
@@ -43,7 +43,9 @@ namespace SHADE
     if (!camComponent)
     {
       SHLOG_WARNING("Camera Director warning: Entity does not have a camera");
+      return nullptr;
     }
+    return camComponent;
   }
 
 
diff --git a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp
index 19eb5168..1c603c57 100644
--- a/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp
+++ b/SHADE_Engine/src/ECS_Base/Managers/SHEntityManager.cpp
@@ -146,7 +146,7 @@ namespace SHADE
 		//Call all the children to Destroy themselves first before the parent is destroyed.
 		if (entityVec[eIndex])
 		{
-			auto& children = SHSceneManager::GetCurrentSceneGraph().GetChildren(eID);
+			auto children = SHSceneManager::GetCurrentSceneGraph().GetChildren(eID);
 			for (auto& child : children)
 			{
 				DestroyEntity(child->GetEntityID());