diff --git a/MangoPay/ApiCards.php b/MangoPay/ApiCards.php
index 33e3f484..d3f1a0c9 100644
--- a/MangoPay/ApiCards.php
+++ b/MangoPay/ApiCards.php
@@ -45,7 +45,7 @@ public function Update($card)
      * Gets a Card's PreAuthorizations
      * @param int $cardId ID of the Card for which to retrieve PreAuthorizations
      * @param \MangoPay\Pagination $pagination Pagination object
-     * @param \MangoPay\FilterPreAuthorizations filter Filtering object
+     * @param \MangoPay\FilterPreAuthorizations $filter Filtering object
      * @param \MangoPay\Sorting $sorting Sorting object
      * @return \MangoPay\CardPreAuthorization[] List of the Card's PreAuthorizations
      */
diff --git a/MangoPay/ApiClients.php b/MangoPay/ApiClients.php
index 584b5027..88ace0d2 100644
--- a/MangoPay/ApiClients.php
+++ b/MangoPay/ApiClients.php
@@ -37,7 +37,8 @@ public function Update($client)
      * Upload a logo for client.
      * Only GIF, PNG, JPG, JPEG, BMP, PDF and DOC formats are accepted,
      * and file must be less than about 7MB
-     * @param \MangoPay\ClientLogoUpload $logo ClientLogoUpload object
+     * @param \MangoPay\ClientLogoUpload $logoUpload ClientLogoUpload object
+     * @param string|null $idempotencyKey
      */
     public function UploadLogo($logoUpload, $idempotencyKey = null)
     {
diff --git a/MangoPay/ApiDisputes.php b/MangoPay/ApiDisputes.php
index de041b1a..1a456b94 100644
--- a/MangoPay/ApiDisputes.php
+++ b/MangoPay/ApiDisputes.php
@@ -47,7 +47,7 @@ public function GetPendingSettlements(& $pagination = null, $sorting = null)
 
     /**
      * Updates dispute's tag
-     * @param \MangoPay\Dispute Dispute object to update
+     * @param \MangoPay\Dispute $dispute Dispute object to update
      * @return \MangoPay\Dispute Transfer instance returned from API
      */
     public function Update($dispute)
diff --git a/MangoPay/ApiPayOuts.php b/MangoPay/ApiPayOuts.php
index c0edfcb6..3a5c65f9 100644
--- a/MangoPay/ApiPayOuts.php
+++ b/MangoPay/ApiPayOuts.php
@@ -61,7 +61,7 @@ public function GetBankwire($payOutId)
      * Returns a list of Refunds pertaining to a certain PayOut.
      * @param string $payOutId ID of the PayOut for which to retrieve Refunds
      * @param \MangoPay\Pagination $pagination Pagination object
-     * @param \MangoPay\FilterRefunds filter Filtering object
+     * @param \MangoPay\FilterRefunds $filter Filtering object
      * @param \MangoPay\Sorting $sorting Sorting object
      * @return \MangoPay\Refund[] List of Refunds for the PayOut
      */
diff --git a/MangoPay/BankingAliasOTHER.php b/MangoPay/BankingAliasOTHER.php
index a308ddd8..637335dc 100644
--- a/MangoPay/BankingAliasOTHER.php
+++ b/MangoPay/BankingAliasOTHER.php
@@ -5,22 +5,26 @@
 class BankingAliasOTHER extends BankingAlias
 {
     /**
-     * @var Type
+     * Type
+     * @var string
      */
     public $Type;
 
     /**
      * Account Number
+     * @var string
      */
     public $AccountNumber;
 
     /**
      * BIC
+     * @var string
      */
     public $BIC;
 
     /**
      * Country
+     * @var string
      */
     public $Country;
 }
diff --git a/MangoPay/Libraries/ApiBase.php b/MangoPay/Libraries/ApiBase.php
index 8e848897..d7555cab 100644
--- a/MangoPay/Libraries/ApiBase.php
+++ b/MangoPay/Libraries/ApiBase.php
@@ -243,7 +243,8 @@ protected function getLogger()
 
     /**
      * Constructor
-     * @param \MangoPay\MangoPayApi Root/parent instance that holds the OAuthToken and Configuration instance
+     * Root/parent instance that holds the OAuthToken and Configuration instance
+     * @param \MangoPay\MangoPayApi $root
      */
     public function __construct($root)
     {
@@ -310,7 +311,6 @@ protected function CreateObject($methodKey, $entity, $responseClassName = null,
      * Get entity object from API
      * @param string $methodKey Key with request data
      * @param object $responseClassName Name of entity class from response
-     * @param array $params path variable in urls
      * @return object Response data
      * @throws Exception
      */
diff --git a/MangoPay/Libraries/AuthenticationHelper.php b/MangoPay/Libraries/AuthenticationHelper.php
index 1c1d5098..fc4c4b54 100644
--- a/MangoPay/Libraries/AuthenticationHelper.php
+++ b/MangoPay/Libraries/AuthenticationHelper.php
@@ -12,7 +12,8 @@ class AuthenticationHelper
 
     /**
      * Constructor
-     * @param \MangoPay\MangoPayApi Root/parent instance that holds the OAuth token and Configuration instance
+     * Root/parent instance that holds the OAuthToken and Configuration instance
+     * @param \MangoPay\MangoPayApi $root
      */
     public function __construct($root)
     {
diff --git a/MangoPay/Libraries/UrlTool.php b/MangoPay/Libraries/UrlTool.php
index 42fa0cd1..0e1e3a17 100644
--- a/MangoPay/Libraries/UrlTool.php
+++ b/MangoPay/Libraries/UrlTool.php
@@ -12,7 +12,8 @@ class UrlTool
 
     /**
      * Constructor
-     * @param \MangoPay\MangoPayApi Root/parent instance that holds the OAuthToken and Configuration instance
+     * Root/parent instance that holds the OAuthToken and Configuration instance
+     * @param \MangoPay\MangoPayApi $root
      */
     public function __construct($root)
     {
diff --git a/MangoPay/PayInExecutionDetailsDirect.php b/MangoPay/PayInExecutionDetailsDirect.php
index 9750df76..4dd88f2c 100644
--- a/MangoPay/PayInExecutionDetailsDirect.php
+++ b/MangoPay/PayInExecutionDetailsDirect.php
@@ -72,5 +72,7 @@ public function GetSubObjects()
         $subObjects = parent::GetSubObjects();
         $subObjects['Billing'] = '\MangoPay\Billing';
         $subObjects['SecurityInfo'] = '\MangoPay\SecurityInfo';
+
+        return $subObjects;
     }
 }
diff --git a/MangoPay/PayInPaymentDetailsPayconiq.php b/MangoPay/PayInPaymentDetailsPayconiq.php
index b57e90bf..d6821b83 100644
--- a/MangoPay/PayInPaymentDetailsPayconiq.php
+++ b/MangoPay/PayInPaymentDetailsPayconiq.php
@@ -9,7 +9,7 @@ class PayInPaymentDetailsPayconiq extends Libraries\Dto implements PayInPaymentD
 {
     /**
      * The country of your user (should be BE, NL or LU)
-     * @var $Country
+     * @var string
      */
     public $Country;