diff --git a/lib/private/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
index c97302ab25..0c1e5904e0 100644
--- a/lib/private/setup/abstractdatabase.php
+++ b/lib/private/setup/abstractdatabase.php
@@ -91,5 +91,8 @@ abstract class AbstractDatabase {
 		$this->tablePrefix = $dbTablePrefix;
 	}
 
+	/**
+	 * @param string $userName
+	 */
 	abstract public function setupDatabase($userName);
 }
diff --git a/lib/private/setup/mysql.php b/lib/private/setup/mysql.php
index e6afad6033..de2466676c 100644
--- a/lib/private/setup/mysql.php
+++ b/lib/private/setup/mysql.php
@@ -71,7 +71,7 @@ class MySQL extends AbstractDatabase {
 	}
 
 	/**
-	 * @param IDbConnection $connection
+	 * @param IDBConnection $connection
 	 * @throws \OC\DatabaseSetupException
 	 */
 	private function createDBUser($connection) {
diff --git a/lib/private/share/helper.php b/lib/private/share/helper.php
index 1645e4451a..f9581e48e6 100644
--- a/lib/private/share/helper.php
+++ b/lib/private/share/helper.php
@@ -227,7 +227,7 @@ class Helper extends \OC\Share\Constants {
 	 *
 	 * all return: http://localhost
 	 *
-	 * @param string $shareWith
+	 * @param string $remote
 	 * @return string
 	 */
 	protected static function fixRemoteURL($remote) {
@@ -244,7 +244,7 @@ class Helper extends \OC\Share\Constants {
 	 * split user and remote from federated cloud id
 	 *
 	 * @param string $id
-	 * @return array
+	 * @return string[]
 	 * @throws HintException
 	 */
 	public static function splitUserRemote($id) {
diff --git a/lib/private/share/share.php b/lib/private/share/share.php
index 96b920fe99..51d98fff79 100644
--- a/lib/private/share/share.php
+++ b/lib/private/share/share.php
@@ -2297,6 +2297,16 @@ class Share extends Constants {
 		return $id ? $id : false;
 	}
 
+	/**
+	 * @param string $itemType
+	 * @param string $itemSource
+	 * @param integer $shareType
+	 * @param string $shareWith
+	 * @param string $uidOwner
+	 * @param integer $permissions
+	 * @param string|null $itemSourceName
+	 * @param null|\DateTime $expirationDate
+	 */
 	private static function checkReshare($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions, $itemSourceName, $expirationDate) {
 		$backend = self::getBackend($itemType);
 
diff --git a/lib/private/template.php b/lib/private/template.php
index ae3e857a79..d068150b33 100644
--- a/lib/private/template.php
+++ b/lib/private/template.php
@@ -70,6 +70,10 @@ class OC_Template extends \OC\Template\Base {
 	
 	protected static $initTemplateEngineFirstRun = true;
 	
+	/**
+	 * @param string $app
+	 * @param string $name
+	 */
 	public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
 		// Read the selected theme from the config file
 		self::initTemplateEngine($renderAs);
@@ -92,6 +96,9 @@ class OC_Template extends \OC\Template\Base {
 		parent::__construct($template, $requestToken, $l10n, $themeDefaults);
 	}
 
+	/**
+	 * @param string $renderAs
+	 */
 	public static function initTemplateEngine($renderAs) {
 		if (self::$initTemplateEngineFirstRun){
 			
@@ -182,7 +189,7 @@ class OC_Template extends \OC\Template\Base {
 	 * Checking all the possible locations.
 	 * @param string $theme
 	 * @param string $app
-	 * @return array
+	 * @return string[]
 	 */
 	protected function findTemplate($theme, $app, $name) {
 		// Check if it is a app template or not.
diff --git a/lib/private/updater.php b/lib/private/updater.php
index 32264484ee..1c5e8a3a26 100644
--- a/lib/private/updater.php
+++ b/lib/private/updater.php
@@ -35,7 +35,6 @@ namespace OC;
 
 use OC\Hooks\BasicEmitter;
 use OC\IntegrityCheck\Checker;
-use OC\IntegrityCheck\Storage;
 use OC_App;
 use OC_Installer;
 use OC_Util;
@@ -287,7 +286,7 @@ class Updater extends BasicEmitter {
 	 * @param string $installedVersion previous version from which to upgrade from
 	 *
 	 * @throws \Exception
-	 * @return bool true if the operation succeeded, false otherwise
+	 * @return boolean|null true if the operation succeeded, false otherwise
 	 */
 	private function doUpgrade($currentVersion, $installedVersion) {
 		// Stop update if the update is over several major versions
diff --git a/lib/private/user.php b/lib/private/user.php
index ae98bb9b01..21971fc3d1 100644
--- a/lib/private/user.php
+++ b/lib/private/user.php
@@ -253,7 +253,7 @@ class OC_User {
 	 * Sets user display name for session
 	 *
 	 * @param string $uid
-	 * @param null $displayName
+	 * @param string $displayName
 	 * @return bool Whether the display name could get set
 	 */
 	public static function setDisplayName($uid, $displayName = null) {