diff --git a/src/contracts/helpers/UiPoolDataProviderV3.sol b/src/contracts/helpers/UiPoolDataProviderV3.sol
index 83c1a1fd..ddc7eb20 100644
--- a/src/contracts/helpers/UiPoolDataProviderV3.sol
+++ b/src/contracts/helpers/UiPoolDataProviderV3.sol
@@ -188,7 +188,7 @@ contract UiPoolDataProviderV3 is IUiPoolDataProviderV3 {
     uint8 eModesFound = 0;
     uint8 missCounter = 0;
     for (uint8 i = 1; i < 256; i++) {
-      DataTypes.EModeCategory memory category = pool.getEModeCategoryData(uint8(i));
+      DataTypes.EModeCategory memory category = pool.getEModeCategoryData(i);
       if (category.liquidationThreshold != 0) {
         tempCategories[eModesFound] = Emode({eMode: category, id: i});
         ++eModesFound;
diff --git a/src/contracts/protocol/pool/PoolConfigurator.sol b/src/contracts/protocol/pool/PoolConfigurator.sol
index 255ccfd4..60f9d53a 100644
--- a/src/contracts/protocol/pool/PoolConfigurator.sol
+++ b/src/contracts/protocol/pool/PoolConfigurator.sol
@@ -424,7 +424,7 @@ abstract contract PoolConfigurator is VersionedInitializable, IPoolConfigurator
     DataTypes.ReserveDataLegacy memory reserveData = _pool.getReserveData(asset);
     categoryData.setCollateral(reserveData.id, allowed);
     _pool.configureEModeCategory(categoryId, categoryData);
-    emit AssetCollateralInEModeChanged(asset, uint8(categoryId), allowed);
+    emit AssetCollateralInEModeChanged(asset, categoryId, allowed);
   }
 
   /// @inheritdoc IPoolConfigurator