diff --git a/Content.Server/Chat/SuicideSystem.cs b/Content.Server/Chat/SuicideSystem.cs
index e896fce125..b533a3f003 100644
--- a/Content.Server/Chat/SuicideSystem.cs
+++ b/Content.Server/Chat/SuicideSystem.cs
@@ -172,7 +172,7 @@ public sealed class SuicideSystem : EntitySystem
         // Corvax-IPC-start
         //args.DamageType ??= "Bloodloss";
         string entityPrototypeId = "";
-        if (EntityManager.TryGetComponent<MetaDataComponent>(victim, out var metaData) && metaData.EntityPrototype != null)
+        if (TryComp(victim, out MetaDataComponent? metaData) && metaData.EntityPrototype != null)
             entityPrototypeId = metaData.EntityPrototype.ID;
 
         if (entityPrototypeId != "MobIpc")
diff --git a/Content.Server/Telephone/TelephoneSystem.cs b/Content.Server/Telephone/TelephoneSystem.cs
index d5a5842d4c..0314a116b9 100644
--- a/Content.Server/Telephone/TelephoneSystem.cs
+++ b/Content.Server/Telephone/TelephoneSystem.cs
@@ -118,12 +118,12 @@ public sealed class TelephoneSystem : SharedTelephoneSystem
         // If speaker entity has TTS, the telephone will speak with the same voice
         if(TryComp<TTSComponent>(args.MessageSource, out var ttsSpeaker))
         {
-            EntityManager.EnsureComponent<TTSComponent>(entity, out var ttsTelephone);
+            var ttsTelephone = EnsureComp<TTSComponent>(entity);
             ttsTelephone.VoicePrototypeId = ttsSpeaker.VoicePrototypeId;
         }
         else // Remove TTS if the speaker has no TTS
         {
-            EntityManager.RemoveComponent<TTSComponent>(entity);
+            RemComp<TTSComponent>(entity);
         }
         // Corvax-TTS-End
         _chat.TrySendInGameICMessage(speaker, args.Message, volume, range, nameOverride: name, checkRadioPrefix: false);