diff --git a/CTA/CustomTeamAssigner/CustomRoles.cs b/CTA/CustomTeamAssigner/CustomRoles.cs
index 09cac221b..c46593994 100644
--- a/CTA/CustomTeamAssigner/CustomRoles.cs
+++ b/CTA/CustomTeamAssigner/CustomRoles.cs
@@ -34,6 +34,7 @@ public enum CustomRoles
     Changeling,
     Chronomancer,
     Cleaner,
+    ClockBlocker,
     Commander,
     EvilDiviner, // Consigliere
     Consort,
@@ -229,6 +230,7 @@ public enum CustomRoles
     Psychic,
     Rabbit,
     Randomizer,
+    Retributionist,
     Rhapsode,
     Ricochet,
     Safeguard,
diff --git a/Modules/OptionHolder.cs b/Modules/OptionHolder.cs
index 140f3270c..c6c625dbd 100644
--- a/Modules/OptionHolder.cs
+++ b/Modules/OptionHolder.cs
@@ -1619,10 +1619,10 @@ public static class Options
         EnableMovementChecking = new BooleanOptionItem(19329, "EnableMovementChecking", false, TabGroup.SystemSettings)
             .SetHeader(true);
 
-        EnableEHRRateLimit = new BooleanOptionItem(19318, "EnableEHRRateLimit", true, TabGroup.SystemSettings)
+        EnableEHRRateLimit = new BooleanOptionItem(19333, "EnableEHRRateLimit", true, TabGroup.SystemSettings)
             .SetHeader(true);
 
-        KickOnInvalidRPC = new BooleanOptionItem(19319, "KickOnInvalidRPC", true, TabGroup.SystemSettings)
+        KickOnInvalidRPC = new BooleanOptionItem(19334, "KickOnInvalidRPC", true, TabGroup.SystemSettings)
             .SetHeader(true);
 
 
diff --git a/Patches/GameStartManagerPatch.cs b/Patches/GameStartManagerPatch.cs
index 161a1de80..2f125497c 100644
--- a/Patches/GameStartManagerPatch.cs
+++ b/Patches/GameStartManagerPatch.cs
@@ -27,19 +27,21 @@ public static class GameStartManagerUpdatePatch
     }
 }
 
+[HarmonyPatch]
 public static class GameStartManagerPatch
 {
     public static long TimerStartTS;
     private static TextMeshPro WarningText;
     public static float Timer => Math.Max(0, 597f - (Utils.TimeStamp - TimerStartTS));
 
-    [HarmonyPatch(typeof(TimerTextTMP), nameof(TimerTextTMP.GetTextString))]
-    private static class TimerTextTMPGetTextStringPatch
+    [HarmonyPatch(typeof(TimerTextTMP), nameof(TimerTextTMP.UpdateText))]
+    public static class TimerTextTMPUpdateTextPatch
     {
-        public static bool Prefix(TimerTextTMP __instance, ref string __result)
+        public static bool Prefix(TimerTextTMP __instance)
         {
             int seconds = __instance.GetSecondsRemaining();
-            __result = string.Format(GetString("LobbyTimer"), seconds / 60, seconds % 60);
+            __instance.text.text = string.Format(GetString("LobbyTimer"), seconds / 60, seconds % 60);
+            Logger.Warn($"Remaining time: {seconds / 60:00}:{seconds % 60:00}", "TimerTextTMPGetTextStringPatch.Prefix");
             return false;
         }
     }
diff --git a/Roles/Crewmate/Imitator.cs b/Roles/Crewmate/Imitator.cs
index de5d192ff..370c7350d 100644
--- a/Roles/Crewmate/Imitator.cs
+++ b/Roles/Crewmate/Imitator.cs
@@ -11,7 +11,7 @@ public class Imitator : RoleBase
 
     public override void SetupCustomOption()
     {
-        StartSetup(653100);
+        StartSetup(653190);
     }
 
     public override void Init()