diff --git a/selfdrive/selfdrived/selfdrived.py b/selfdrive/selfdrived/selfdrived.py
index 778ba6be7e..3cc383ab9c 100755
--- a/selfdrive/selfdrived/selfdrived.py
+++ b/selfdrive/selfdrived/selfdrived.py
@@ -440,9 +440,9 @@ class SelfdriveD:
ss.alertText1 = self.sm['alertDebug'].alertText1
ss.alertText2 = self.sm['alertDebug'].alertText2
ss.alertSize = AlertSize.mid
- ss.alertStatus = AlertStatus.normal
+ ss.alertStatus = AlertStatus.critical if 'Active' in ss.alertText1 else AlertStatus.normal
ss.alertType = ''
- ss.alertSound = AudibleAlert.none
+ ss.alertSound = AudibleAlert.prompt if 'Active' in ss.alertText1 else AudibleAlert.none
self.pm.send('selfdriveState', ss_msg)
diff --git a/tools/longitudinal_maneuvers/generate_report.py b/tools/longitudinal_maneuvers/generate_report.py
index 54fc6f231f..47b4e2815f 100755
--- a/tools/longitudinal_maneuvers/generate_report.py
+++ b/tools/longitudinal_maneuvers/generate_report.py
@@ -26,10 +26,10 @@ def report(platform, maneuvers):
f.write("
\n")
f.write(f"{description}
\n")
for run, msgs in enumerate(runs):
- t_carControl, carControl = zip(*[(m.logMonoTime, m.carControl) for m in msgs if m.which() == 'carControl'])
- t_carOutput, carOutput = zip(*[(m.logMonoTime, m.carOutput) for m in msgs if m.which() == 'carOutput'])
- t_carState, carState = zip(*[(m.logMonoTime, m.carState) for m in msgs if m.which() == 'carState'])
- t_longitudinalPlan, longitudinalPlan = zip(*[(m.logMonoTime, m.longitudinalPlan) for m in msgs if m.which() == 'longitudinalPlan'])
+ t_carControl, carControl = zip(*[(m.logMonoTime, m.carControl) for m in msgs if m.which() == 'carControl'], strict=True)
+ t_carOutput, carOutput = zip(*[(m.logMonoTime, m.carOutput) for m in msgs if m.which() == 'carOutput'], strict=True)
+ t_carState, carState = zip(*[(m.logMonoTime, m.carState) for m in msgs if m.which() == 'carState'], strict=True)
+ t_longitudinalPlan, longitudinalPlan = zip(*[(m.logMonoTime, m.longitudinalPlan) for m in msgs if m.which() == 'longitudinalPlan'], strict=True)
longActive = [m.longActive for m in carControl]
gasPressed = [m.gasPressed for m in carState]