diff --git a/Content.Shared/MagicMirror/MagicMirrorSystem.cs b/Content.Shared/MagicMirror/MagicMirrorSystem.cs
index 0d59c7dff2..fe7c3a5715 100644
--- a/Content.Shared/MagicMirror/MagicMirrorSystem.cs
+++ b/Content.Shared/MagicMirror/MagicMirrorSystem.cs
@@ -68,7 +68,7 @@ public sealed partial class MagicMirrorSystem : EntitySystem
 
         if (ent.Comp.DoAfter.HasValue)
         {
-            _doAfter.Cancel(target, ent.Comp.DoAfter.Value);
+            _doAfter.Cancel(args.Actor, ent.Comp.DoAfter.Value);
             ent.Comp.DoAfter = null;
         }
 
diff --git a/Resources/ConfigPresets/WizardsDen/salamander.toml b/Resources/ConfigPresets/WizardsDen/salamander.toml
index 0877fc5577..7112fc8d8b 100644
--- a/Resources/ConfigPresets/WizardsDen/salamander.toml
+++ b/Resources/ConfigPresets/WizardsDen/salamander.toml
@@ -1,7 +1,7 @@
 # Configuration preset used on Wizard's Den Salamander
 
 [game]
-desc = "Official English Space Station 14 servers. Medium roleplay ruleset. You must apply for a whitelist on the official forums to be able to join. If the current player count is less than 15 players then anyone with enough playtime on Wizard's Den servers may join."
+desc = "Official English Space Station 14 servers. Medium roleplay ruleset. Open to anyone with at least 20 hours of playtime on any Wizard's Den server. Freely joinable when the player count is less than 15 players."
 hostname = "[EN][MRP] Wizard's Den Salamander [US West]"
 round_restart_time = 300
 
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
index d57af0a41c..4f69ba3d09 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Singularity/singularity.yml
@@ -13,6 +13,7 @@
     bodyType: Dynamic
     bodyStatus: InAir
   - type: CanMoveInAir
+  - type: TileFrictionModifier
   - type: EventHorizon # To make the singularity consume things.
     radius: 0.5
     canBreachContainment: false
diff --git a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
index 52e82847cb..44ffe8638d 100644
--- a/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
+++ b/Resources/Prototypes/Entities/Structures/Power/Generation/Tesla/energyball.yml
@@ -8,6 +8,7 @@
     bodyStatus: InAir
     sleepingAllowed: false
   - type: CanMoveInAir
+  - type: TileFrictionModifier
   - type: ChasingWalk
     minSpeed: 1
     maxSpeed: 3