diff --git a/Source/UnrealMLAgents/Private/Academy.cpp b/Source/UnrealMLAgents/Private/Academy.cpp
index f7504dd..88da02a 100644
--- a/Source/UnrealMLAgents/Private/Academy.cpp
+++ b/Source/UnrealMLAgents/Private/Academy.cpp
@@ -3,8 +3,7 @@
 #include "UnrealMLAgents/Academy.h"
 
 #if WITH_EDITOR
-	#include "Editor/EditorEngine.h"
-	#include "Editor.h"
+#include "Editor/EditorEngine.h"
 #endif
 
 #include "GenericPlatform/GenericPlatformMisc.h"
@@ -222,7 +221,10 @@ void UAcademy::Dispose()
 
 void UAcademy::Dispose(bool bIsSimulating)
 {
-
+        FCoreDelegates::OnExit.RemoveAll(this);
+#if WITH_EDITOR
+        FEditorDelegates::EndPIE.RemoveAll(this);
+#endif
 	if (BoundBridge.IsValid())
 	{
 		BoundBridge->OnFixedStep.RemoveDynamic(this, &UAcademy::HandleFixedStep);
diff --git a/Source/UnrealMLAgents/UnrealMLAgents.Build.cs b/Source/UnrealMLAgents/UnrealMLAgents.Build.cs
index cc7c398..f70fe5d 100644
--- a/Source/UnrealMLAgents/UnrealMLAgents.Build.cs
+++ b/Source/UnrealMLAgents/UnrealMLAgents.Build.cs
@@ -19,16 +19,16 @@ public UnrealMLAgents(ReadOnlyTargetRules Target) : base(Target)
                 PublicDependencyModuleNames.AddRange(
                         new string[] { "Core", "CoreUObject", "Engine", "SimCadenceRuntime" });
 
-                PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore" });
+                PrivateDependencyModuleNames.AddRange(new string[] { "Slate", "SlateCore", "Projects" });
 
                 if (Target.bBuildEditor)
                 {
-                        PrivateDependencyModuleNames.Add("SimCadenceEditor");
-                        PublicDefinitions.Add("WITH_SIMCADENCE_EDITOR=1");
+                        PrivateDependencyModuleNames.Add("UnrealEd");
+                        PublicDefinitions.Add("WITH_UNREALED=1");
                 }
                 else
                 {
-                        PublicDefinitions.Add("WITH_SIMCADENCE_EDITOR=0");
+                        PublicDefinitions.Add("WITH_UNREALED=0");
                 }
 
 		AddEngineThirdPartyPrivateStaticDependencies(Target, "OpenSSL");