diff --git a/apps/user_ldap/lib/configuration.php b/apps/user_ldap/lib/configuration.php
index e810fb835d..75d244255c 100644
--- a/apps/user_ldap/lib/configuration.php
+++ b/apps/user_ldap/lib/configuration.php
@@ -281,7 +281,6 @@ class Configuration {
 	 * 
 	 * @param string $varName name of config-key
 	 * @param array|string $value to set
-	 * @param boolean $trim Trim value? (default: false)
 	 */
 	protected function setMultiLine($varName, $value) {
 		if(empty($value)) {
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index 8ebb5ab30e..87c857a844 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -152,8 +152,8 @@ class USER_LDAP extends BackendUtility implements \OCP\IUserBackend, \OCP\UserIn
 	 * Get a list of all users
 	 *
 	 * @param string $search
-	 * @param null|int $limit
-	 * @param null|int $offset
+	 * @param integer $limit
+	 * @param integer $offset
 	 * @return string[] an array of all uids
 	 */
 	public function getUsers($search = '', $limit = 10, $offset = 0) {
diff --git a/build/license.php b/build/license.php
index 738ace8b1a..ce6fceb816 100644
--- a/build/license.php
+++ b/build/license.php
@@ -118,6 +118,9 @@ With help from many libraries and frameworks including:
 		echo "License updated: $path" . PHP_EOL;
 	}
 
+	/**
+	 * @param string $source
+	 */
 	private function isMITLicensed($source) {
 		$lines = explode(PHP_EOL, $source);
 		while(!empty($lines)) {
@@ -131,6 +134,9 @@ With help from many libraries and frameworks including:
 		return false;
 	}
 
+	/**
+	 * @param string $source
+	 */
 	private function eatOldLicense($source) {
 		$lines = explode(PHP_EOL, $source);
 		while(!empty($lines)) {
diff --git a/lib/private/app/dependencyanalyzer.php b/lib/private/app/dependencyanalyzer.php
index ba2479ae7a..0cf4bc7216 100644
--- a/lib/private/app/dependencyanalyzer.php
+++ b/lib/private/app/dependencyanalyzer.php
@@ -73,7 +73,7 @@ class DependencyAnalyzer {
 	 * 5.2.6.5 and 5.1 will be turned into 5.2 and 5.1
 	 * @param string $first
 	 * @param string $second
-	 * @return array first element is the first version, second element is the
+	 * @return string[] first element is the first version, second element is the
 	 * second version
 	 */
 	private function normalizeVersions($first, $second) {
diff --git a/lib/private/app/platformrepository.php b/lib/private/app/platformrepository.php
index 730c67f45e..7363b2a44b 100644
--- a/lib/private/app/platformrepository.php
+++ b/lib/private/app/platformrepository.php
@@ -206,6 +206,9 @@ class PlatformRepository {
 		throw new \UnexpectedValueException('Invalid version string "' . $version . '"' . $extraMessage);
 	}
 
+	/**
+	 * @param string $stability
+	 */
 	private function expandStability($stability) {
 		$stability = strtolower($stability);
 		switch ($stability) {
diff --git a/lib/private/db/migrator.php b/lib/private/db/migrator.php
index cd310bb75a..7ca3f98135 100644
--- a/lib/private/db/migrator.php
+++ b/lib/private/db/migrator.php
@@ -52,7 +52,7 @@ class Migrator {
 	protected $config;
 
 	/**
-	 * @param \Doctrine\DBAL\Connection $connection
+	 * @param Connection $connection
 	 * @param ISecureRandom $random
 	 * @param IConfig $config
 	 */
diff --git a/lib/private/defaults.php b/lib/private/defaults.php
index 1fa8352edc..43e8c8082c 100644
--- a/lib/private/defaults.php
+++ b/lib/private/defaults.php
@@ -261,6 +261,9 @@ class OC_Defaults {
 		return $footer;
 	}
 
+	/**
+	 * @param string $key
+	 */
 	public function buildDocLinkToKey($key) {
 		if ($this->themeExist('buildDocLinkToKey')) {
 			return $this->theme->buildDocLinkToKey($key);