diff --git a/includes/api/ApiBase.php b/includes/api/ApiBase.php
index f776e6d4476..c2b942aa782 100644
--- a/includes/api/ApiBase.php
+++ b/includes/api/ApiBase.php
@@ -1239,7 +1239,7 @@ abstract class ApiBase extends ContextSource {
 	 *
 	 * @since 1.22
 	 * @param Status $status Status object
-	 * @throws UsageException
+	 * @throws MWException
 	 */
 	public function dieStatus( $status ) {
 		if ( $status->isGood() ) {
@@ -1519,6 +1519,7 @@ abstract class ApiBase extends ContextSource {
 	 * Internal code errors should be reported with this method
 	 * @param string $method Method or function name
 	 * @param string $message Error message
+	 * @throws MWException
 	 */
 	protected static function dieDebug( $method, $message ) {
 		throw new MWException( "Internal error in $method: $message" );
diff --git a/includes/api/ApiQueryImageInfo.php b/includes/api/ApiQueryImageInfo.php
index 9981ec12139..91a9a7d59cd 100644
--- a/includes/api/ApiQueryImageInfo.php
+++ b/includes/api/ApiQueryImageInfo.php
@@ -310,7 +310,7 @@ class ApiQueryImageInfo extends ApiQueryBase {
 	 * @param array $prop of properties to get (in the keys)
 	 * @param $result ApiResult object
 	 * @param array $thumbParams containing 'width' and 'height' items, or null
-	 * @param string|array $metadataOpts Options for metadata fetching.
+	 * @param array|bool|string $metadataOpts Options for metadata fetching.
 	 *   This is an array consisting of the keys:
 	 *    'version': The metadata version for the metadata option
 	 *    'language': The language for extmetadata property
diff --git a/includes/api/ApiQueryLinks.php b/includes/api/ApiQueryLinks.php
index 3157a7bb161..1eecbe2e09c 100644
--- a/includes/api/ApiQueryLinks.php
+++ b/includes/api/ApiQueryLinks.php
@@ -76,8 +76,7 @@ class ApiQueryLinks extends ApiQueryGeneratorBase {
 	}
 
 	/**
-	 * @param $resultPageSet ApiPageSet
-	 * @return
+	 * @param ApiPageSet $resultPageSet
 	 */
 	private function run( $resultPageSet = null ) {
 		if ( $this->getPageSet()->getGoodTitleCount() == 0 ) {