diff --git a/src/cm_utils/cm_dlock.c b/src/cm_utils/cm_dlock.c
index 4789ac411d9b8bc8ceab172f5a786fd7eeb3431f..67322d329eb07481435d04eebe0160c786580576 100644
--- a/src/cm_utils/cm_dlock.c
+++ b/src/cm_utils/cm_dlock.c
@@ -213,7 +213,7 @@ status_t cm_disk_timed_lock_s(dlock_t *lock, const char *scsi_dev, uint64 wait_u
     return CM_SUCCESS;
 }
 
-int32 cm_disk_lockf_s(dlock_t *lock, const char *scsi_dev)
+status_t cm_disk_lockf_s(dlock_t *lock, const char *scsi_dev)
 {
 #ifdef WIN32
 #else
diff --git a/src/ddes_perctrl/service/ddes_perctrl_server.c b/src/ddes_perctrl/service/ddes_perctrl_server.c
index a221e4a8214c884e3674d0cb155db0c91f688d6e..d8b20152bb393b7c5ff48792c9b7df945d501550 100644
--- a/src/ddes_perctrl/service/ddes_perctrl_server.c
+++ b/src/ddes_perctrl/service/ddes_perctrl_server.c
@@ -891,7 +891,7 @@ static status_t exec_perctrl_req(perctrl_packet_t *req, perctrl_packet_t *ack)
     }
 
     perctrl_cmd_hdl_t *handle = get_cmd_handle(cmd);
-    if ((handle == NULL) || (handle->exec == NULL)) {
+    if (handle == NULL) {
         LOG_DEBUG_ERR("The req command: %d is not valid.", cmd);
         ddes_return_error(req, ack);
         return CM_ERROR;