diff --git a/sql/rpl_gtid_state.cc b/sql/rpl_gtid_state.cc
index cdad0fc77b62..7031eb599c94 100644
--- a/sql/rpl_gtid_state.cc
+++ b/sql/rpl_gtid_state.cc
@@ -965,7 +965,7 @@ enum_return_status Gtid_state::ensure_commit_group_sidnos(rpl_sidno sidno) {
 
 enum_return_status Gtid_state::remove_logged_gtid_on_trim(
     const std::vector<std::string> &trimmed_gtids) {
-  DBUG_ENTER("Gtid_state::remove_logged_gtid_on_trim");
+  DBUG_TRACE;
   global_sid_lock->assert_some_lock();
 
   if (trimmed_gtids.empty()) RETURN_OK;
diff --git a/sql/rpl_handler.cc b/sql/rpl_handler.cc
index 0a1b0aa60512..1807e350f6ef 100644
--- a/sql/rpl_handler.cc
+++ b/sql/rpl_handler.cc
@@ -1692,18 +1692,15 @@ static int set_durability(
 }
 
 extern "C" void *process_raft_queue(void *) {
-  THD *thd;
   bool thd_added = false;
 
   Global_THD_manager *thd_manager = Global_THD_manager::get_instance();
   /* Setup this thread */
   my_thread_init();
-  thd = new THD;
+  THD *thd = new THD;
   thd->thread_stack = (char *)&thd;
   thd->store_globals();
-  // thd->thr_create_utime = thd->start_utime = my_micro_time();
-  thd->m_security_ctx->skip_grants();
-
+  thd->security_context()->skip_grants();
   thd->set_new_thread_id();
   thd_manager->add_thd(thd);
   thd_added = true;
diff --git a/sql/rpl_rli.cc b/sql/rpl_rli.cc
index d91b5ee51709..6ae51ebc056a 100644
--- a/sql/rpl_rli.cc
+++ b/sql/rpl_rli.cc
@@ -1908,7 +1908,7 @@ int Relay_log_info::rli_init_info(bool skip_received_gtid_set_recovery) {
 
 int Relay_log_info::remove_logged_gtids(
     const std::vector<std::string> &trimmed_gtids) {
-  DBUG_ENTER("Relay_log_info::remove_logged_gtid");
+  DBUG_TRACE;
   global_sid_lock->assert_some_lock();
 
   if (trimmed_gtids.empty()) RETURN_OK;