diff --git a/lib/app/ogs-init.c b/lib/app/ogs-init.c
index f5cb8b768..e3fbeb916 100644
--- a/lib/app/ogs-init.c
+++ b/lib/app/ogs-init.c
@@ -32,9 +32,6 @@ int ogs_app_initialize(
         char *log_file;
         char *log_level;
         char *domain_mask;
-
-        bool enable_debug;
-        bool enable_trace;
     } optarg;
 
     ogs_core_initialize();
diff --git a/src/amf/nf-sm.c b/src/amf/nf-sm.c
index 5a02c12dd..f0786e02e 100644
--- a/src/amf/nf-sm.c
+++ b/src/amf/nf-sm.c
@@ -195,7 +195,7 @@ void amf_nf_state_registered(ogs_fsm_t *s, amf_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;
diff --git a/src/ausf/nf-sm.c b/src/ausf/nf-sm.c
index e28bc1b7c..c49a22fe0 100644
--- a/src/ausf/nf-sm.c
+++ b/src/ausf/nf-sm.c
@@ -195,7 +195,7 @@ void ausf_nf_state_registered(ogs_fsm_t *s, ausf_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;
diff --git a/src/bsf/nf-sm.c b/src/bsf/nf-sm.c
index 0d986a4a0..b22a1d821 100644
--- a/src/bsf/nf-sm.c
+++ b/src/bsf/nf-sm.c
@@ -196,7 +196,7 @@ void bsf_nf_state_registered(ogs_fsm_t *s, bsf_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;
diff --git a/src/nrf/nf-sm.c b/src/nrf/nf-sm.c
index cf8d342db..8a45439a7 100644
--- a/src/nrf/nf-sm.c
+++ b/src/nrf/nf-sm.c
@@ -189,7 +189,7 @@ void nrf_nf_state_registered(ogs_fsm_t *s, nrf_event_t *e)
 
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
-        ogs_info("[%s] NF registred [Heartbeat:%ds]",
+        ogs_info("[%s] NF registered [Heartbeat:%ds]",
                 nf_instance->id, nf_instance->time.heartbeat_interval);
         if (nf_instance->time.heartbeat_interval) {
             ogs_timer_start(nf_instance->t_no_heartbeat,
diff --git a/src/nssf/nf-sm.c b/src/nssf/nf-sm.c
index 7a598967c..bf635635e 100644
--- a/src/nssf/nf-sm.c
+++ b/src/nssf/nf-sm.c
@@ -195,7 +195,7 @@ void nssf_nf_state_registered(ogs_fsm_t *s, nssf_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;
diff --git a/src/pcf/nf-sm.c b/src/pcf/nf-sm.c
index 6861d883b..0831b2cf5 100644
--- a/src/pcf/nf-sm.c
+++ b/src/pcf/nf-sm.c
@@ -195,7 +195,7 @@ void pcf_nf_state_registered(ogs_fsm_t *s, pcf_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;
diff --git a/src/smf/nf-sm.c b/src/smf/nf-sm.c
index fa0d4c51b..c5a8ec89d 100644
--- a/src/smf/nf-sm.c
+++ b/src/smf/nf-sm.c
@@ -196,7 +196,7 @@ void smf_nf_state_registered(ogs_fsm_t *s, smf_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;
diff --git a/src/udm/nf-sm.c b/src/udm/nf-sm.c
index 581bbf13d..48f9016e1 100644
--- a/src/udm/nf-sm.c
+++ b/src/udm/nf-sm.c
@@ -195,7 +195,7 @@ void udm_nf_state_registered(ogs_fsm_t *s, udm_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;
diff --git a/src/udr/nf-sm.c b/src/udr/nf-sm.c
index fd6d6cbef..ea63ab522 100644
--- a/src/udr/nf-sm.c
+++ b/src/udr/nf-sm.c
@@ -195,7 +195,7 @@ void udr_nf_state_registered(ogs_fsm_t *s, udr_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;
diff --git a/tests/af/nf-sm.c b/tests/af/nf-sm.c
index 910d84f57..bd99d4f7b 100644
--- a/tests/af/nf-sm.c
+++ b/tests/af/nf-sm.c
@@ -196,7 +196,7 @@ void af_nf_state_registered(ogs_fsm_t *s, af_event_t *e)
     switch (e->id) {
     case OGS_FSM_ENTRY_SIG:
         if (NF_INSTANCE_IS_SELF(nf_instance->id)) {
-            ogs_info("[%s] NF registred [Heartbeat:%ds]",
+            ogs_info("[%s] NF registered [Heartbeat:%ds]",
                     nf_instance->id, nf_instance->time.heartbeat_interval);
 
             client = nf_instance->client;