diff --git a/src/Connectors/AutoEntityCreator.cs b/src/Connectors/AutoEntityCreator.cs
index e2b31a7..f109ad7 100644
--- a/src/Connectors/AutoEntityCreator.cs
+++ b/src/Connectors/AutoEntityCreator.cs
@@ -2,6 +2,7 @@ using UnityEngine;
 
 namespace DCFApixels.DragonECS
 {
+    [DisallowMultipleComponent]
     public class AutoEntityCreator : MonoBehaviour
     {
         [SerializeField]
diff --git a/src/Connectors/EcsEntityConnect.cs b/src/Connectors/EcsEntityConnect.cs
index 7ab7271..f266ad9 100644
--- a/src/Connectors/EcsEntityConnect.cs
+++ b/src/Connectors/EcsEntityConnect.cs
@@ -5,6 +5,7 @@ using UnityEngine;
 
 namespace DCFApixels.DragonECS
 {
+    [DisallowMultipleComponent]
     public class EcsEntityConnect : MonoBehaviour
     {
         private sealed class Aspect : EcsAspect
diff --git a/src/Connectors/Editor/AutoEntityCreatorEditor.cs b/src/Connectors/Editor/AutoEntityCreatorEditor.cs
index 07155c8..7c77873 100644
--- a/src/Connectors/Editor/AutoEntityCreatorEditor.cs
+++ b/src/Connectors/Editor/AutoEntityCreatorEditor.cs
@@ -10,7 +10,19 @@ namespace DCFApixels.DragonECS.Unity.Editors
     {
         public override void OnInspectorGUI()
         {
-            base.OnInspectorGUI();
+            EditorGUI.BeginChangeCheck();
+            var iterator = serializedObject.GetIterator();
+            iterator.NextVisible(true);
+            while (iterator.NextVisible(false))
+            {
+                EditorGUILayout.PropertyField(iterator, true);
+            }
+            if (EditorGUI.EndChangeCheck())
+            {
+                serializedObject.ApplyModifiedProperties();
+            }
+
+
             if (GUILayout.Button("Autoset"))
             {
                 foreach (var tr in targets)
diff --git a/src/EntityTemplate/Templates/MonoEntityTemplate.cs b/src/EntityTemplate/Templates/MonoEntityTemplate.cs
index 3e7d248..5bb3d5f 100644
--- a/src/EntityTemplate/Templates/MonoEntityTemplate.cs
+++ b/src/EntityTemplate/Templates/MonoEntityTemplate.cs
@@ -3,6 +3,7 @@ using UnityEngine;
 
 namespace DCFApixels.DragonECS
 {
+    [DisallowMultipleComponent]
     public class MonoEntityTemplate : MonoBehaviour, ITemplateInternal
     {
         [SerializeReference]