diff --git a/examples/common/DefaultChargePointEventsHandler.cpp b/examples/common/DefaultChargePointEventsHandler.cpp
index e871ced0..bd6e86dd 100644
--- a/examples/common/DefaultChargePointEventsHandler.cpp
+++ b/examples/common/DefaultChargePointEventsHandler.cpp
@@ -168,24 +168,16 @@ bool DefaultChargePointEventsHandler::remoteStartTransactionRequested(unsigned i
 {
     bool ret = false;
     cout << "Remote start transaction : " << connector_id << " - " << id_tag << endl;
-    if (connector_id != 0)
+
+    if(connector_id > m_config.ocppConfig().numberOfConnectors() || connector_id == 0)
     {
-        m_remote_start_pending[connector_id - 1u] = true;
-        m_remote_start_id_tag[connector_id - 1u]  = id_tag;
-        ret                                       = true;
+        ret=false;
     }
     else
     {
-        for (size_t i = 1; i <= m_config.ocppConfig().numberOfConnectors(); i++)
-        {
-            if (m_chargepoint->getConnectorStatus(i) < ChargePointStatus::Charging)
-            {
-                m_remote_start_pending[i - 1u] = true;
-                m_remote_start_id_tag[i - 1u]  = id_tag;
-                ret                            = true;
-                break;
-            }
-        }
+        m_remote_start_pending[connector_id - 1u] = true;
+        m_remote_start_id_tag[connector_id - 1u]  = id_tag;
+        ret=true;
     }
     return ret;
 }
diff --git a/examples/common/config/OcppConfig.cpp b/examples/common/config/OcppConfig.cpp
index 3c53f5a9..f54908a9 100644
--- a/examples/common/config/OcppConfig.cpp
+++ b/examples/common/config/OcppConfig.cpp
@@ -197,18 +197,16 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
     {
         if ((it->second & PARAM_WRITE) != 0)
         {
-            std::size_t key_is_interval = key.find("Interval");
-            if (key_is_interval != std::string::npos)
-            {
-                std::size_t value_is_negative = key.find("-");
-                if (value_is_negative)
-                {
-                    ret = ConfigurationStatus::Rejected;
-                }
-            }
+             if (key.find("Interval") != std::string::npos)
+             {
+                 if (value.find("-") != std::string::npos)
+                 {
+                     ret = ConfigurationStatus::Rejected;
+                 }
+             }
 
-            if (ret != ConfigurationStatus::Rejected)
-            {
+             if (ret != ConfigurationStatus::Rejected)
+             {
                 if ((it->second & PARAM_OCPP) != 0)
                 {
                     m_config.set(OCPP_PARAMS, key, value);
@@ -225,7 +223,7 @@ ocpp::types::ConfigurationStatus OcppConfig::setConfiguration(const std::string&
                 {
                     ret = ConfigurationStatus::Accepted;
                 }
-            }
+             }
         }
         else
         {