diff --git a/ReallifeGamemode.Server/Commands/FactionCommands.cs b/ReallifeGamemode.Server/Commands/FactionCommands.cs
index acad0b23..faae6191 100644
--- a/ReallifeGamemode.Server/Commands/FactionCommands.cs
+++ b/ReallifeGamemode.Server/Commands/FactionCommands.cs
@@ -363,7 +363,7 @@ namespace ReallifeGamemode.Server.Commands
         return;
       }
 
-      if(player.Position.DistanceTo(target.Position) > 3)
+      if(player.Position.DistanceTo(target.Position) > 5)
       {
         ChatService.ErrorMessage(player, "Der Patient ist zu weit entfernt");
         return;
diff --git a/ReallifeGamemode.Server/Extensions/ClientExtension.cs b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
index 6849968d..ebdee723 100644
--- a/ReallifeGamemode.Server/Extensions/ClientExtension.cs
+++ b/ReallifeGamemode.Server/Extensions/ClientExtension.cs
@@ -129,9 +129,9 @@ namespace ReallifeGamemode.Server.Extensions
       {
         User dbUser = dbContext.Users.Where(u => u.Id == user.Id).FirstOrDefault();
         dbUser.Wanteds = newWanteds;
+        dbUser.SetBlipAndNametagColor();
         dbContext.SaveChanges();
       }
-      user.SetBlipAndNametagColor();
       ChatService.SendMessage(user.Player, "!{#FF614A}Du hast ein Verbrechen begangen: " + reason + "" + (cop != null ? " | Gemeldet von: " + cop.Name + "." : ""));
       ChatService.SendMessage(user.Player, "  !{#FFFF00}Fahnundgslevel:~s~ " + newWanteds);
 
diff --git a/ReallifeGamemode.Server/Factions/Medic/Medic.cs b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
index 2c4a1154..f4050385 100644
--- a/ReallifeGamemode.Server/Factions/Medic/Medic.cs
+++ b/ReallifeGamemode.Server/Factions/Medic/Medic.cs
@@ -101,15 +101,15 @@ namespace ReallifeGamemode.Server.Factions.Medic
 
     public static void CheckHealDecisionDistance()
     {
-      foreach(var healAuftrag in HealDecisions)
+      foreach(var healAuftrag in HealDecisions.ToList())
       {
-        if (healAuftrag.dMedic.Position.DistanceTo(healAuftrag.dTarget.Position) >= 10)
+        if (healAuftrag.dMedic.Position.DistanceTo(healAuftrag.dTarget.Position) > 5)
         {
           healAuftrag.dMedic.SendNotification("~r~Die Heal-Anfrage wurde abgebrochen");
           healAuftrag.dTarget.SendNotification("~r~Die Heal-Anfrage wurde abgebrochen");
           healAuftrag.dTarget.ResetData("healDecision");
           var activeDecision = HealDecisions.FirstOrDefault(d => d.dTarget == healAuftrag.dTarget);
-          HealDecisions.Remove(activeDecision);
+          HealDecisions.Remove(healAuftrag);
         }
       }
     }
diff --git a/ReallifeGamemode.Server/Managers/InteractionManager.cs b/ReallifeGamemode.Server/Managers/InteractionManager.cs
index 0ad66ab3..5d6875fc 100644
--- a/ReallifeGamemode.Server/Managers/InteractionManager.cs
+++ b/ReallifeGamemode.Server/Managers/InteractionManager.cs
@@ -63,7 +63,7 @@ namespace ReallifeGamemode.Server.Managers
           own.FactionRank = dbContext
               .FactionRanks
               .OrderBy(x => x.Order)
-              .Where(r => r.FactionId == own.FactionId)
+              .Where(r => r.FactionId == u.FactionId)
               .FirstOrDefault();
 
           ChatService.SendMessage(leader, "!{02FCFF}" + player.Name + " hat die Einladung angenommen.");