diff --git a/scripts/fetch_site_images.py b/scripts/fetch_site_images.py
index ddaeaaba..deee4fb1 100644
--- a/scripts/fetch_site_images.py
+++ b/scripts/fetch_site_images.py
@@ -172,7 +172,7 @@ def fetch_icons() -> None:
 
 
 def main() -> None:
-    parser = argparse.ArgumentParser(description=__doc__.split("\n\n")[0])
+    parser = argparse.ArgumentParser(allow_abbrev=False, description=__doc__.split("\n\n")[0])
     parser.add_argument("--only", choices=("logos", "icons"), help="fetch one kind only")
     args = parser.parse_args()
     if args.only in (None, "logos"):
@@ -184,4 +184,6 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    from common import run_cli
+
+    run_cli(main)
diff --git a/scripts/make_og_cards.py b/scripts/make_og_cards.py
index ec472fb5..e25f5731 100644
--- a/scripts/make_og_cards.py
+++ b/scripts/make_og_cards.py
@@ -45,4 +45,6 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    from common import run_cli
+
+    run_cli(main)
diff --git a/scripts/sitediagrams.py b/scripts/sitediagrams.py
index d06cacb0..6df4d2f8 100644
--- a/scripts/sitediagrams.py
+++ b/scripts/sitediagrams.py
@@ -744,7 +744,7 @@ def write_svgs(directory: Path) -> list[Path]:
 def main() -> None:
     import argparse
 
-    parser = argparse.ArgumentParser(description="Write the site diagrams as SVG files.")
+    parser = argparse.ArgumentParser(allow_abbrev=False, description="Write the site diagrams as SVG files.")
     parser.add_argument("--output-dir", default="tmp/diagrams", help="default: %(default)s")
     args = parser.parse_args()
     for path in write_svgs(Path(args.output_dir)):
@@ -752,4 +752,6 @@ def main() -> None:
 
 
 if __name__ == "__main__":
-    main()
+    from common import run_cli
+
+    run_cli(main)
diff --git a/tests/test_audit_regressions.py b/tests/test_audit_regressions.py
index 3d872ef4..58b44745 100644
--- a/tests/test_audit_regressions.py
+++ b/tests/test_audit_regressions.py
@@ -779,7 +779,11 @@ class FaqRegressions(unittest.TestCase):
 
     @staticmethod
     def _faq() -> str:
-        return (ROOT / "wiki" / "faq.md").read_text(encoding="utf-8")
+        # The questions about hashes and checks moved to the technical FAQ.
+        return "\n\n".join(
+            (ROOT / "wiki" / name).read_text(encoding="utf-8")
+            for name in ("faq.md", "technical-faq.md")
+        )
 
     @staticmethod
     def _profile(key: str) -> dict: