diff --git a/includes/api/ApiQueryUsers.php b/includes/api/ApiQueryUsers.php
index 591ace93e10..edcbc1a439f 100644
--- a/includes/api/ApiQueryUsers.php
+++ b/includes/api/ApiQueryUsers.php
@@ -250,7 +250,7 @@ class ApiQueryUsers extends ApiQueryBase {
 			}
 			$done[] = $u;
 		}
-		return $result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'user' );
+		$result->setIndexedTagName_internal( array( 'query', $this->getModuleName() ), 'user' );
 	}
 
 	/**
diff --git a/includes/parser/LinkHolderArray.php b/includes/parser/LinkHolderArray.php
index 9f1fff22de7..e1fdbc342dd 100644
--- a/includes/parser/LinkHolderArray.php
+++ b/includes/parser/LinkHolderArray.php
@@ -254,12 +254,12 @@ class LinkHolderArray {
 	 * @todo FIXME: Update documentation. makeLinkObj() is deprecated.
 	 * Replace <!--LINK--> link placeholders with actual links, in the buffer
 	 * Placeholders created in Skin::makeLinkObj()
-	 * Returns an array of link CSS classes, indexed by PDBK.
+	 * @return array of link CSS classes, indexed by PDBK.
 	 */
 	function replace( &$text ) {
 		wfProfileIn( __METHOD__ );
 
-		$colours = $this->replaceInternal( $text );
+		$colours = $this->replaceInternal( $text ); // FIXME: replaceInternal doesn't return a value
 		$this->replaceInterwiki( $text );
 
 		wfProfileOut( __METHOD__ );
diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 08d1517f8f4..85b9cf8c0ce 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -140,7 +140,8 @@ class SpecialNewpages extends IncludableSpecialPage {
 
 			$feedType = $this->opts->getValue( 'feed' );
 			if( $feedType ) {
-				return $this->feed( $feedType );
+				$this->feed( $feedType );
+				return;
 			}
 
 			$allValues = $this->opts->getAllValues();