diff --git a/config/config-sil-dc-d20.yaml b/config/config-sil-dc-d20.yaml
index d7d3aa5c9..3f13adc10 100644
--- a/config/config-sil-dc-d20.yaml
+++ b/config/config-sil-dc-d20.yaml
@@ -44,7 +44,7 @@ active_modules:
         - module_id: imd
           implementation_id: main
   powersupply_dc:
-    module: JsDCSupplySimulator
+    module: DCSupplySimulator
   yeti_driver:
     module: JsYetiSimulator
     config_module:
diff --git a/modules/EvseManager/energy_grid/energyImpl.cpp b/modules/EvseManager/energy_grid/energyImpl.cpp
index ef254411d..343db1b7e 100644
--- a/modules/EvseManager/energy_grid/energyImpl.cpp
+++ b/modules/EvseManager/energy_grid/energyImpl.cpp
@@ -508,8 +508,8 @@ void energyImpl::handle_enforce_limits(types::energy::EnforcedLimits& value) {
                     session_log.evse(
                         true,
                         fmt::format("Change HLC Limits: {}W/{}A, target_voltage {}, actual_voltage {}, hack_bpt {}",
-                                    evseMaxLimits.maximum_power, evseMaxLimits.maximum_current,
-                                    target_voltage, actual_voltage, mod->is_actually_exporting_to_grid));
+                                    evseMaxLimits.maximum_power, evseMaxLimits.maximum_current, target_voltage,
+                                    actual_voltage, mod->is_actually_exporting_to_grid));
                     mod->r_hlc[0]->call_update_dc_maximum_limits(evseMaxLimits);
                     mod->charger->inform_new_evse_max_hlc_limits(evseMaxLimits);
 
diff --git a/modules/EvseV2G/charger/ISO15118_chargerImpl.cpp b/modules/EvseV2G/charger/ISO15118_chargerImpl.cpp
index 6c422d208..53354ec33 100644
--- a/modules/EvseV2G/charger/ISO15118_chargerImpl.cpp
+++ b/modules/EvseV2G/charger/ISO15118_chargerImpl.cpp
@@ -343,8 +343,8 @@ void ISO15118_chargerImpl::handle_update_dc_maximum_limits(
                             iso2_unitSymbolType_W);
     v2g_ctx->evse_v2g_data.evse_maximum_power_limit_is_used = 1;
 
-    populate_physical_value_float(&v2g_ctx->evse_v2g_data.evse_maximum_voltage_limit,
-                                  maximum_limits.maximum_voltage, 1, iso2_unitSymbolType_V);
+    populate_physical_value_float(&v2g_ctx->evse_v2g_data.evse_maximum_voltage_limit, maximum_limits.maximum_voltage, 1,
+                                  iso2_unitSymbolType_V);
     v2g_ctx->evse_v2g_data.evse_maximum_voltage_limit_is_used = 1;
 }
 
@@ -352,11 +352,9 @@ void ISO15118_chargerImpl::handle_update_dc_minimum_limits(
     types::iso15118_charger::DC_EVSEMinimumLimits& minimum_limits) {
 
     populate_physical_value_float(&v2g_ctx->evse_v2g_data.evse_minimum_current_limit,
-                                  static_cast<long long int>(minimum_limits.minimum_current), 1,
-                                  iso2_unitSymbolType_A);
+                                  static_cast<long long int>(minimum_limits.minimum_current), 1, iso2_unitSymbolType_A);
     populate_physical_value_float(&v2g_ctx->evse_v2g_data.evse_minimum_voltage_limit,
-                                  static_cast<long long int>(minimum_limits.minimum_voltage), 1,
-                                  iso2_unitSymbolType_V);
+                                  static_cast<long long int>(minimum_limits.minimum_voltage), 1, iso2_unitSymbolType_V);
 }
 
 void ISO15118_chargerImpl::handle_update_isolation_status(types::iso15118_charger::IsolationStatus& isolation_status) {
diff --git a/modules/Iso15118/D20Evse/charger/ISO15118_chargerImpl.cpp b/modules/Iso15118/D20Evse/charger/ISO15118_chargerImpl.cpp
index f652ffb42..86870f8f7 100644
--- a/modules/Iso15118/D20Evse/charger/ISO15118_chargerImpl.cpp
+++ b/modules/Iso15118/D20Evse/charger/ISO15118_chargerImpl.cpp
@@ -130,7 +130,7 @@ void ISO15118_chargerImpl::ready() {
         try {
             controller->loop();
         } catch (const std::exception& e) {
-            EVLOG_error << "D20Evse chrashed: " << e.what();
+            EVLOG_error << "D20Evse crashed: " << e.what();
             publish_dlink_error(nullptr);
         }
 
diff --git a/types/iso15118_charger.yaml b/types/iso15118_charger.yaml
index b4c5e7f29..a6e81a5b1 100644
--- a/types/iso15118_charger.yaml
+++ b/types/iso15118_charger.yaml
@@ -185,7 +185,7 @@ types:
         minimum: 0
         maximum: 1500
       maximum_discharge_current:
-        description: Maximum discharge current the EVSE can deliver in W
+        description: Maximum discharge current the EVSE can deliver in A
         type: number
         minimum: 0
         maximum: 10000
@@ -219,7 +219,7 @@ types:
         minimum: 0
         maximum: 1000000
       minimum_discharge_current:
-        description: Minimum discharge current the EVSE can deliver in W
+        description: Minimum discharge current the EVSE can deliver in A
         type: number
         minimum: 0
         maximum: 10000