diff --git a/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h b/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h
index b9ea8eb..1815977 100644
--- a/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h
+++ b/Plugins/Cog/Source/CogEngine/Public/CogEngineCollisionTester.h
@@ -125,8 +125,8 @@ public:
     FColor ImpactNormalColor = FColor::Cyan;
 
     UPROPERTY(EditAnywhere)
-    USceneComponent* StartComponent = nullptr;
+    TObjectPtr<USceneComponent> StartComponent;
 
     UPROPERTY(EditAnywhere)
-    USceneComponent* EndComponent = nullptr;
+    TObjectPtr<USceneComponent> EndComponent;
 };
diff --git a/Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h b/Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h
index fdb2325..b616c84 100644
--- a/Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h
+++ b/Plugins/Cog/Source/CogWindow/Public/CogWindowManager.h
@@ -134,10 +134,10 @@ protected:
     static FString ResetLayoutCommand;
 
     UPROPERTY()
-    mutable TArray<UCogCommonConfig*> Configs;
+    mutable TArray<TObjectPtr<UCogCommonConfig>> Configs;
 
     UPROPERTY()
-    mutable TArray<const UObject*> Assets;
+    mutable TArray<TObjectPtr<const UObject>> Assets;
 
     UPROPERTY(Config)
     bool bShowMainMenu = false;