diff --git a/src/5gmsaf/metrics-reporting-configuration.c b/src/5gmsaf/metrics-reporting-configuration.c
index 4cad218..fc7dcc9 100644
--- a/src/5gmsaf/metrics-reporting-configuration.c
+++ b/src/5gmsaf/metrics-reporting-configuration.c
@@ -81,8 +81,7 @@ msaf_metrics_reporting_configuration_t* process_and_map_metrics_reporting_config
         provisioning_session->metrics_reporting_map = msaf_metrics_reporting_map();
     }
 
-    char *hashKey = msaf_strdup(msaf_metrics_config->config->metrics_reporting_configuration_id);
-    ogs_hash_set(provisioning_session->metrics_reporting_map, hashKey, OGS_HASH_KEY_STRING, msaf_metrics_config);
+    ogs_hash_set(provisioning_session->metrics_reporting_map, msaf_metrics_config->config->metrics_reporting_configuration_id, OGS_HASH_KEY_STRING, msaf_metrics_config);
 
     return msaf_metrics_config;
 }
diff --git a/src/5gmsaf/msaf-m1-sm.c b/src/5gmsaf/msaf-m1-sm.c
index 80412f4..cbd4a3b 100644
--- a/src/5gmsaf/msaf-m1-sm.c
+++ b/src/5gmsaf/msaf-m1-sm.c
@@ -462,8 +462,8 @@ void msaf_m1_state_functional(ogs_fsm_t *s, msaf_event_t *e)
                                         ogs_list_remove(&extra_domains_list, node);
                                         ogs_free(node);
                                     }
-
-                                    ogs_hash_set(msaf_provisioning_session->certificate_map, msaf_strdup(csr_cert->id), OGS_HASH_KEY_STRING, msaf_strdup(csr_cert->id));
+                                    char *csr_cert_id = msaf_strdup(csr_cert->id);
+                                    ogs_hash_set(msaf_provisioning_session->certificate_map, csr_cert_id, OGS_HASH_KEY_STRING, csr_cert_id);
                                     ogs_sbi_response_t *response;
                                     location = ogs_msprintf("%s/%s", request->h.uri, csr_cert->id);
                                     if (csr_cert->cache_control_max_age) {
diff --git a/src/5gmsaf/provisioning-session.c b/src/5gmsaf/provisioning-session.c
index 1f51574..f1e2210 100644
--- a/src/5gmsaf/provisioning-session.c
+++ b/src/5gmsaf/provisioning-session.c
@@ -1000,7 +1000,7 @@ free_ogs_hash_entry(void *rec, const void *key, int klen, const void *value)
     free_ogs_hash_context_t *fohc = (free_ogs_hash_context_t*)rec;
     ogs_hash_set(fohc->hash, key, klen, NULL);
     fohc->value_free_fn((void*)value);
-    ogs_free((void*)key);
+    //ogs_free((void*)key);
     return 1;
 }