diff --git a/src/applications/auth/engine/PhabricatorAuthSessionEngine.php b/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
--- a/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
+++ b/src/applications/auth/engine/PhabricatorAuthSessionEngine.php
@@ -304,8 +304,8 @@
    * multifactor authentication.
    *
    * @param PhabricatorUser $user User whose sessions should be terminated.
-   * @param string|null $except_session (optional) One session to keep.
-   *   Normally, the current login session.
+   * @param PhutilOpaqueEnvelope|null $except_session (optional) One session to
+   *   keep. Normally, the current login session.
    *
    * @return void
    */
diff --git a/src/applications/base/PhabricatorApplication.php b/src/applications/base/PhabricatorApplication.php
--- a/src/applications/base/PhabricatorApplication.php
+++ b/src/applications/base/PhabricatorApplication.php
@@ -331,8 +331,8 @@
    * Build items for the main menu.
    *
    * @param  PhabricatorUser    $user The viewing user.
-   * @param  AphrontController  $controller (optional) The current controller.
-   *   May be null for special pages like 404, exception handlers, etc.
+   * @param  PhabricatorController|null  $controller (optional) The current
+   *   controller. Null for special pages like 404, exception handlers, etc.
    * @return list<PHUIListItemView> List of menu items.
    * @task ui
    */
diff --git a/src/applications/people/storage/PhabricatorUser.php b/src/applications/people/storage/PhabricatorUser.php
--- a/src/applications/people/storage/PhabricatorUser.php
+++ b/src/applications/people/storage/PhabricatorUser.php
@@ -803,7 +803,7 @@
   /**
    * Write to the availability cache.
    *
-   * @param wild $availability Availability cache data.
+   * @param array $availability Availability cache data.
    * @param int|null $ttl Cache TTL.
    * @return $this
    * @task availability