diff --git a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
index 09a4fc0cb..f8805c951 100644
--- a/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
+++ b/Barotrauma/BarotraumaClient/Source/Characters/Animation/Ragdoll.cs
@@ -108,6 +108,61 @@ namespace Barotrauma
                         }
                     }
                     
+                    //unconscious/dead characters can't correct their position using AnimController movement
+                    // -> we need to correct it manually
+                    if (!character.AllowInput)
+                    {
+                        float mainLimbDistSqrd = Vector2.DistanceSquared(MainLimb.PullJointWorldAnchorA, Collider.SimPosition);
+                        float mainLimbErrorTolerance = 0.1f;
+                        //if the main limb is roughly at the correct position and the collider isn't moving (much at least),
+                        //don't attempt to correct the position.
+                        if (mainLimbDistSqrd > mainLimbErrorTolerance || Collider.LinearVelocity.LengthSquared() > 0.05f)
+                        {
+                            MainLimb.PullJointWorldAnchorB = Collider.SimPosition;
+                            MainLimb.PullJointEnabled = true;
+                        }
+                        character.SelectedConstruction = character.MemState[0].SelectedItem;
+                    }
+
+                    if (character.MemState[0].Animation == AnimController.Animation.CPR)
+                    {
+                        character.AnimController.Anim = AnimController.Animation.CPR;
+                    }
+                    else if (character.AnimController.Anim == AnimController.Animation.CPR)
+                    {
+                        character.AnimController.Anim = AnimController.Animation.None;
+                    }
+
+                    Vector2 newVelocity = Collider.LinearVelocity;
+                    Vector2 newPosition = Collider.SimPosition;
+                    float newRotation = Collider.Rotation;
+                    float newAngularVelocity = Collider.AngularVelocity;
+                    Collider.CorrectPosition(character.MemState, out newPosition, out newVelocity, out newRotation, out newAngularVelocity);
+
+                    newVelocity = newVelocity.ClampLength(100.0f);
+                    if (!MathUtils.IsValid(newVelocity)) { newVelocity = Vector2.Zero; }
+                    overrideTargetMovement = newVelocity.LengthSquared() > 0.01f ? newVelocity : Vector2.Zero;
+
+                    Collider.LinearVelocity = newVelocity;
+                    Collider.AngularVelocity = newAngularVelocity;
+
+                    float distSqrd = Vector2.DistanceSquared(newPosition, Collider.SimPosition);
+                    float errorTolerance = character.AllowInput ? 0.01f : 0.2f;
+                    if (distSqrd > errorTolerance)
+                    {
+                        if (distSqrd > 10.0f || !character.AllowInput)
+                        {
+                            Collider.TargetRotation = newRotation;
+                            SetPosition(newPosition, lerp: distSqrd < 5.0f);
+                        }
+                        else
+                        {
+                            Collider.TargetRotation = newRotation;
+                            Collider.TargetPosition = newPosition;
+                            Collider.MoveToTargetPosition(true);
+                        }
+                    }
+                    
                     //unconscious/dead characters can't correct their position using AnimController movement
                     // -> we need to correct it manually
                     if (!character.AllowInput)
diff --git a/Barotrauma/BarotraumaClient/Source/DebugConsole.cs b/Barotrauma/BarotraumaClient/Source/DebugConsole.cs
index 1ee8fba4d..486b30939 100644
--- a/Barotrauma/BarotraumaClient/Source/DebugConsole.cs
+++ b/Barotrauma/BarotraumaClient/Source/DebugConsole.cs
@@ -394,6 +394,10 @@ namespace Barotrauma
 
             commands.Add(new Command("charactereditor|editcharacter|editcharacters|editanimation|editanimations|animedit|animationeditor|animeditor|animationedit", "charactereditor: Edit characters, animations, ragdolls....", (string[] args) =>
             {
+                if (Screen.Selected == GameMain.GameScreen)
+                {
+                    NewMessage("WARNING: Switching between the character editor and the game view may cause odd behaviour or bugs. Use with caution.", Color.Orange);
+                }
                 GameMain.CharacterEditorScreen.Select();
             }));
 
diff --git a/Barotrauma/BarotraumaServer/Source/Map/Hull.cs b/Barotrauma/BarotraumaServer/Source/Map/Hull.cs
index 3fc9ec6d3..3b10a7a24 100644
--- a/Barotrauma/BarotraumaServer/Source/Map/Hull.cs
+++ b/Barotrauma/BarotraumaServer/Source/Map/Hull.cs
@@ -33,8 +33,7 @@ namespace Barotrauma
             //update client hulls if the amount of water has changed by >10%
             //or if oxygen percentage has changed by 5%
             if (Math.Abs(lastSentVolume - waterVolume) > Volume * 0.1f ||
-                Math.Abs(lastSentOxygen - OxygenPercentage) > 5f ||
-                FireSources.Count > 0)
+                Math.Abs(lastSentOxygen - OxygenPercentage) > 5f)
             {
                 sendUpdateTimer -= deltaTime;
                 if (sendUpdateTimer < 0.0f)
diff --git a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
index 23fc81dce..4c3b594d6 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/Hull.cs
@@ -417,6 +417,11 @@ namespace Barotrauma
         public void AddFireSource(FireSource fireSource)
         {
             FireSources.Add(fireSource);
+
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer && !IdFreed)
+            {
+                GameMain.NetworkMember.CreateEntityEvent(this);
+            }
         }
 
         public override void Update(float deltaTime, Camera cam)
@@ -584,6 +589,11 @@ namespace Barotrauma
         public void RemoveFire(FireSource fire)
         {
             FireSources.Remove(fire);
+
+            if (GameMain.NetworkMember != null && GameMain.NetworkMember.IsServer && !Removed && !IdFreed)
+            {
+                GameMain.NetworkMember.CreateEntityEvent(this);
+            }
         }
 
         public IEnumerable<Hull> GetConnectedHulls(int? searchDepth)