diff --git a/Content.Server/Psionics/PsionicsSystem.cs b/Content.Server/Psionics/PsionicsSystem.cs
index 64e68894ff..1eddad36f5 100644
--- a/Content.Server/Psionics/PsionicsSystem.cs
+++ b/Content.Server/Psionics/PsionicsSystem.cs
@@ -263,7 +263,7 @@ public sealed class PsionicsSystem : EntitySystem
     public void RollPsionics(EntityUid uid, PsionicComponent component, bool applyGlimmer = true, float rollEventMultiplier = 1f)
     {
         if (!_cfg.GetCVar(CCVars.PsionicRollsEnabled)
-            || !component.Removable)
+            || !component.Roller)
             return;
 
         // Calculate the initial odds based on the innate potential
diff --git a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
index 90119c3c35..eec9be7099 100644
--- a/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
+++ b/Content.Shared/Psionics/Glimmer/GlimmerSystem.cs
@@ -118,10 +118,8 @@ public sealed class GlimmerSystem : EntitySystem
         if (!_enabled || delta == 0)
             return;
 
-        var x = GlimmerInput;
-
         GlimmerInput += delta;
-        GlimmerOutput = 2000 / (1 + Math.Pow(Math.E, -0.0022 * x)) - 1000;
+        GlimmerOutput = 2000 / (1 + Math.Pow(Math.E, -0.0022 * GlimmerInput)) - 1000;
     }
 
     /// <summary>
@@ -134,10 +132,8 @@ public sealed class GlimmerSystem : EntitySystem
         if (!_enabled || delta == 0)
             return;
 
-        var y = GlimmerOutput;
-
         GlimmerOutput += delta;
-        GlimmerInput = Math.Log((y + 1000) / (1000 - y)) / 0.0022;
+        GlimmerInput = Math.Log((GlimmerOutput + 1000) / (1000 - GlimmerOutput)) / 0.0022;
     }
 
     /// <summary>
@@ -150,10 +146,8 @@ public sealed class GlimmerSystem : EntitySystem
         if (!_enabled || set == 0)
             return;
 
-        var y = GlimmerOutput;
-
         GlimmerOutput = Math.Clamp(set, 0, 999.999);
-        GlimmerInput = Math.Log((y + 1000) / (1000 - y)) / 0.0022;
+        GlimmerInput = Math.Log((GlimmerOutput + 1000) / (1000 - GlimmerOutput)) / 0.0022;
     }
 
     /// <summary>
@@ -166,7 +160,6 @@ public sealed class GlimmerSystem : EntitySystem
         if (!_enabled || set < 0)
             return;
 
-
         GlimmerInput = set;
         GlimmerOutput = 2000 / (1 + Math.Pow(Math.E, -.0022 * set)) - 1000;
     }