diff --git a/library/PSX/Api/Resource.php b/library/PSX/Api/Resource.php
index e016b26f..fb1ad3ab 100644
--- a/library/PSX/Api/Resource.php
+++ b/library/PSX/Api/Resource.php
@@ -195,6 +195,7 @@ public function getAllowedMethods()
     }
 
     /**
+     * @param string $method
      * @return boolean
      */
     public function hasMethod($method)
diff --git a/library/PSX/Data/Importer.php b/library/PSX/Data/Importer.php
index bdbab3db..583fbc79 100644
--- a/library/PSX/Data/Importer.php
+++ b/library/PSX/Data/Importer.php
@@ -90,6 +90,7 @@ public function import($source, MessageInterface $message, TransformerInterface
     /**
      * Returns an importer which understands the provided source
      *
+     * @param mixed $source
      * @return \PSX\Data\Record\ImporterInterface
      */
     public function createBySource($source)
diff --git a/library/PSX/Data/Schema/Generator/JsonSchema.php b/library/PSX/Data/Schema/Generator/JsonSchema.php
index 2659c333..537c3b9f 100644
--- a/library/PSX/Data/Schema/Generator/JsonSchema.php
+++ b/library/PSX/Data/Schema/Generator/JsonSchema.php
@@ -54,6 +54,7 @@ public function generate(SchemaInterface $schema)
     /**
      * Returns the jsonschema as array
      *
+     * @param \PSX\Data\SchemaInterface $schema
      * @return array
      */
     public function toArray(SchemaInterface $schema)
diff --git a/library/PSX/Data/Schema/Visitor/ValidationVisitor.php b/library/PSX/Data/Schema/Visitor/ValidationVisitor.php
index ef324b7a..b854ec22 100644
--- a/library/PSX/Data/Schema/Visitor/ValidationVisitor.php
+++ b/library/PSX/Data/Schema/Visitor/ValidationVisitor.php
@@ -45,6 +45,8 @@ class ValidationVisitor implements VisitorInterface
      * Sets an optional validator which can validate each value through custom
      * filters. This should only be used for filters which can not be defined
      * inside a JsonSchema like i.e. check whether a row exists in a database
+     *
+     * @param \PSX\Validate\ValidatorInterface $validator
      */
     public function setValidator(ValidatorInterface $validator)
     {
diff --git a/library/PSX/Dispatch/Filter/ContentMd5.php b/library/PSX/Dispatch/Filter/ContentMd5.php
index d0111d89..bd3a0dfb 100644
--- a/library/PSX/Dispatch/Filter/ContentMd5.php
+++ b/library/PSX/Dispatch/Filter/ContentMd5.php
@@ -37,7 +37,7 @@ class ContentMd5 implements FilterInterface
 {
     public function handle(RequestInterface $request, ResponseInterface $response, FilterChainInterface $filterChain)
     {
-        $filterChain->handle($request, $response, $filterChain);
+        $filterChain->handle($request, $response);
 
         if (!$response->hasHeader('Content-MD5')) {
             $response->setHeader('Content-MD5', md5(Util::toString($response->getBody())));
diff --git a/library/PSX/Dispatch/Filter/DigestAccessAuthentication.php b/library/PSX/Dispatch/Filter/DigestAccessAuthentication.php
index 84143019..e77a21e0 100644
--- a/library/PSX/Dispatch/Filter/DigestAccessAuthentication.php
+++ b/library/PSX/Dispatch/Filter/DigestAccessAuthentication.php
@@ -152,7 +152,7 @@ public function handle(RequestInterface $request, ResponseInterface $response, F
                 }
 
                 if (strcmp($hash, $params['response']) === 0) {
-                    $this->callSuccess($response, $hash);
+                    $this->callSuccess($response);
 
                     $filterChain->handle($request, $response);
                 } else {
diff --git a/library/PSX/Dispatch/FilterChain.php b/library/PSX/Dispatch/FilterChain.php
index cc3ab349..f4d59ceb 100644
--- a/library/PSX/Dispatch/FilterChain.php
+++ b/library/PSX/Dispatch/FilterChain.php
@@ -69,7 +69,7 @@ public function handle(RequestInterface $request, ResponseInterface $response)
             // if we have no filters check whether we have another filter chain
             // which should be called next
             if ($this->filterChain !== null) {
-                $this->filterChain->handle($request, $response, $this->filterChain);
+                $this->filterChain->handle($request, $response);
             }
         } elseif ($filter instanceof FilterInterface) {
             if ($this->logger !== null) {
diff --git a/library/PSX/LoaderInterface.php b/library/PSX/LoaderInterface.php
index 493a77cb..5938d4ab 100644
--- a/library/PSX/LoaderInterface.php
+++ b/library/PSX/LoaderInterface.php
@@ -22,6 +22,7 @@
 
 use PSX\Http\RequestInterface;
 use PSX\Http\ResponseInterface;
+use PSX\Loader\Context;
 
 /**
  * LoaderInterface
@@ -39,7 +40,8 @@ interface LoaderInterface
      *
      * @param \PSX\Http\RequestInterface $request
      * @param \PSX\Http\ResponseInterface $response
+     * @param \PSX\Loader\Context $context
      * @return \PSX\ControllerInterface
      */
-    public function load(RequestInterface $request, ResponseInterface $response);
+    public function load(RequestInterface $request, ResponseInterface $response, Context $context = null);
 }
diff --git a/library/PSX/Sql/Condition.php b/library/PSX/Sql/Condition.php
index 63846f18..9cc36cd3 100644
--- a/library/PSX/Sql/Condition.php
+++ b/library/PSX/Sql/Condition.php
@@ -283,7 +283,7 @@ public function addExpression(ExpressionInterface $expr)
     /**
      * Sets whether the expression is inverse
      *
-     * @param boolean $inverse
+     * @param boolean $isInverse
      * @return \PSX\Sql\Condition
      */
     public function setInverse($isInverse)
@@ -378,6 +378,7 @@ public function hasCondition()
     }
 
     /**
+     * @param \Doctrine\DBAL\Platforms\AbstractPlatform $platform
      * @return string
      */
     public function getStatment(AbstractPlatform $platform = null)
diff --git a/library/PSX/Sql/TableQueryAbstract.php b/library/PSX/Sql/TableQueryAbstract.php
index c0235a23..21b276d6 100644
--- a/library/PSX/Sql/TableQueryAbstract.php
+++ b/library/PSX/Sql/TableQueryAbstract.php
@@ -89,7 +89,6 @@ public function __call($method, $arguments)
         if (substr($method, 0, 8) == 'getOneBy') {
             $column = lcfirst(substr($method, 8));
             $value  = isset($arguments[0]) ? $arguments[0] : null;
-            $fields = isset($arguments[1]) ? $arguments[1] : null;
 
             if (!empty($value)) {
                 $condition = new Condition(array($column, '=', $value));
@@ -97,11 +96,10 @@ public function __call($method, $arguments)
                 throw new InvalidArgumentException('Value required');
             }
 
-            return $this->getOneBy($condition, $fields);
+            return $this->getOneBy($condition);
         } elseif (substr($method, 0, 5) == 'getBy') {
             $column = lcfirst(substr($method, 5));
             $value  = isset($arguments[0]) ? $arguments[0] : null;
-            $fields = isset($arguments[1]) ? $arguments[1] : null;
 
             if (!empty($value)) {
                 $condition = new Condition(array($column, '=', $value));
@@ -109,7 +107,7 @@ public function __call($method, $arguments)
                 throw new InvalidArgumentException('Value required');
             }
 
-            return $this->getBy($condition, $fields);
+            return $this->getBy($condition);
         } else {
             throw new BadMethodCallException('Undefined method ' . $method);
         }
diff --git a/library/PSX/Validate/ValidatorInterface.php b/library/PSX/Validate/ValidatorInterface.php
index fdc0818d..7a9b6a4e 100644
--- a/library/PSX/Validate/ValidatorInterface.php
+++ b/library/PSX/Validate/ValidatorInterface.php
@@ -45,7 +45,7 @@ public function validate($data);
      * Validates a specific property. Searches a fitting validation property
      * inside the list of available rules and applies all filters to the data
      *
-     * @param string $data
+     * @param string $path
      * @param mixed $data
      * @return mixed
      */