diff --git a/contracts/lendingpool/LendingPool.sol b/contracts/lendingpool/LendingPool.sol
index 7ea95be3..288de674 100644
--- a/contracts/lendingpool/LendingPool.sol
+++ b/contracts/lendingpool/LendingPool.sol
@@ -33,7 +33,6 @@ import {ILendingPool} from '../interfaces/ILendingPool.sol';
  * @notice Implements the actions of the LendingPool, and exposes accessory methods to fetch the users and reserve data
  * @author Aave
  **/
-
 contract LendingPool is VersionedInitializable, ILendingPool {
   using SafeMath for uint256;
   using WadRayMath for uint256;
diff --git a/contracts/tokenization/StableDebtToken.sol b/contracts/tokenization/StableDebtToken.sol
index 75771d18..5b286e93 100644
--- a/contracts/tokenization/StableDebtToken.sol
+++ b/contracts/tokenization/StableDebtToken.sol
@@ -82,7 +82,7 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
   }
 
   struct MintLocalVars {
-    uint256 currentPrincipalSupply;
+    uint256 currentSupply;
     uint256 nextSupply;
     uint256 amountInRay;
     uint256 newStableRate;
@@ -110,9 +110,9 @@ contract StableDebtToken is IStableDebtToken, DebtTokenBase {
       uint256 balanceIncrease
     ) = _calculateBalanceIncrease(user);
 
-    vars.currentPrincipalSupply = totalSupply();
+    vars.currentSupply = totalSupply();
     vars.currentAvgStableRate = _avgStableRate;
-    vars.nextSupply = _totalSupply = _calcTotalSupply(vars.currentAvgStableRate).add(amount);
+    vars.nextSupply = vars.currentSupply.add(amount);
 
     vars.amountInRay = amount.wadToRay();
 
diff --git a/helpers/contracts-helpers.ts b/helpers/contracts-helpers.ts
index 3c3a66bb..e871f469 100644
--- a/helpers/contracts-helpers.ts
+++ b/helpers/contracts-helpers.ts
@@ -299,7 +299,7 @@ export const deployGenericAToken = async ([
   const token = await deployContract<AToken>(eContractid.AToken, [
     poolAddress,
     underlyingAssetAddress,
-    ZERO_ADDRESS,
+    reserveTreasuryAddress,
     name,
     symbol,
     incentivesController,