diff --git a/contracts/interfaces/ILendingPoolConfigurator.sol b/contracts/interfaces/ILendingPoolConfigurator.sol
index d66dbc38..6979c091 100644
--- a/contracts/interfaces/ILendingPoolConfigurator.sol
+++ b/contracts/interfaces/ILendingPoolConfigurator.sol
@@ -375,4 +375,3 @@ interface ILendingPoolConfigurator {
    **/
   function isRiskAdmin(address admin) external view returns (bool);
 }
-}
diff --git a/contracts/protocol/lendingpool/LendingPoolConfigurator.sol b/contracts/protocol/lendingpool/LendingPoolConfigurator.sol
index b18ab0a8..ace2d83d 100644
--- a/contracts/protocol/lendingpool/LendingPoolConfigurator.sol
+++ b/contracts/protocol/lendingpool/LendingPoolConfigurator.sol
@@ -59,7 +59,7 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
 
   modifier onlyRiskOrPoolAdmins {
     require(
-      _riskAdmins[msg.sender] || addressesProvider.getPoolAdmin() == msg.sender,
+      _riskAdmins[msg.sender] || _addressesProvider.getPoolAdmin() == msg.sender,
       Errors.LPC_CALLER_NOT_RISK_OR_POOL_ADMIN
     );
     _;
@@ -423,7 +423,11 @@ contract LendingPoolConfigurator is VersionedInitializable, ILendingPoolConfigur
   }
 
   /// @inheritdoc ILendingPoolConfigurator
-  function setReserveFactor(address asset, uint256 reserveFactor) external override onlyRiskOrPoolAdmins {
+  function setReserveFactor(address asset, uint256 reserveFactor)
+    external
+    override
+    onlyRiskOrPoolAdmins
+  {
     DataTypes.ReserveConfigurationMap memory currentConfig = _pool.getConfiguration(asset);
 
     currentConfig.setReserveFactor(reserveFactor);
diff --git a/markets/matic/reservesConfigs.ts b/markets/matic/reservesConfigs.ts
index 36260ef9..cbeba1a6 100644
--- a/markets/matic/reservesConfigs.ts
+++ b/markets/matic/reservesConfigs.ts
@@ -92,8 +92,6 @@ export const strategyMATIC: IReserveParams = {
   borrowCap: '0',
   supplyCap: '0',
   reserveFactor: '2000',
-  borrowCap: '0',
-  supplyCap: '0',
 };
 
 export const strategyAAVE: IReserveParams = {
diff --git a/test-suites/test-aave/configurator.spec.ts b/test-suites/test-aave/configurator.spec.ts
index 9ae47b75..5dc4884c 100644
--- a/test-suites/test-aave/configurator.spec.ts
+++ b/test-suites/test-aave/configurator.spec.ts
@@ -135,14 +135,8 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
     expect(supplyCap).to.be.equal(strategyWETH.supplyCap);
   });
   it('Pauses the ETH reserve by emergency admin', async () => {
-    const {
-      configurator,
-      weth,
-      helpersContract,
-      addressesProvider,
-      users,
-      emergencyAdmin,
-    } = testEnv;
+    const { configurator, weth, helpersContract, addressesProvider, users, emergencyAdmin } =
+      testEnv;
     await configurator.connect(emergencyAdmin.signer).pauseReserve(weth.address);
     const {
       decimals,
@@ -462,9 +456,7 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
 
   it('Activates the ETH reserve for borrowing via risk admin', async () => {
     const { configurator, weth, helpersContract, riskAdmin } = testEnv;
-    await configurator
-      .connect(riskAdmin.signer)
-      .enableBorrowingOnReserve(weth.address, MAX_BORROW_CAP, true);
+    await configurator.connect(riskAdmin.signer).enableBorrowingOnReserve(weth.address, '0', true);
     const { variableBorrowIndex } = await helpersContract.getReserveData(weth.address);
 
     const {
diff --git a/test-suites/test-amm/configurator.spec.ts b/test-suites/test-amm/configurator.spec.ts
index d54abb78..6370ce1c 100644
--- a/test-suites/test-amm/configurator.spec.ts
+++ b/test-suites/test-amm/configurator.spec.ts
@@ -156,7 +156,7 @@ makeSuite('LendingPoolConfigurator', (testEnv: TestEnv) => {
 
   it('Activates the ETH reserve for borrowing', async () => {
     const { configurator, weth, helpersContract } = testEnv;
-    await configurator.enableBorrowingOnReserve(weth.address, MAX_BORROW_CAP, true);
+    await configurator.enableBorrowingOnReserve(weth.address, '0', true);
     const { variableBorrowIndex } = await helpersContract.getReserveData(weth.address);
 
     const {