diff --git a/src/backend/distributed/utils/replication_origin_session_utils.c b/src/backend/distributed/utils/replication_origin_session_utils.c
index dbd244271..800d82ef7 100644
--- a/src/backend/distributed/utils/replication_origin_session_utils.c
+++ b/src/backend/distributed/utils/replication_origin_session_utils.c
@@ -20,8 +20,6 @@ static void SetupMemoryContextResetReplicationOriginHandler(void);
 
 static void SetupReplicationOriginSessionHelper(bool isContexResetSetupNeeded);
 
-static inline bool IsLocalReplicationOriginSessionActive(void);
-
 PG_FUNCTION_INFO_V1(citus_internal_start_replication_origin_tracking);
 PG_FUNCTION_INFO_V1(citus_internal_stop_replication_origin_tracking);
 PG_FUNCTION_INFO_V1(citus_internal_is_replication_origin_tracking_active);
@@ -68,6 +66,16 @@ citus_internal_stop_replication_origin_tracking(PG_FUNCTION_ARGS)
 }
 
 
+/* IsLocalReplicationOriginSessionActive checks if the current replication origin
+ * session is active in the local node.
+ */
+static inline bool
+IsLocalReplicationOriginSessionActive(void)
+{
+	return (replorigin_session_origin == DoNotReplicateId);
+}
+
+
 /* citus_internal_is_replication_origin_tracking_active checks if the current replication origin
  * session is active in the local node.
  */
@@ -79,16 +87,6 @@ citus_internal_is_replication_origin_tracking_active(PG_FUNCTION_ARGS)
 }
 
 
-/* IsLocalReplicationOriginSessionActive checks if the current replication origin
- * session is active in the local node.
- */
-inline bool
-IsLocalReplicationOriginSessionActive(void)
-{
-	return (replorigin_session_origin == DoNotReplicateId);
-}
-
-
 /*
  * SetupMemoryContextResetReplicationOriginHandler registers a callback function
  * that resets the replication origin session in case of any error for the current
diff --git a/src/include/distributed/citus_safe_lib.h b/src/include/distributed/citus_safe_lib.h
index 62142df0a..c22e5ecba 100644
--- a/src/include/distributed/citus_safe_lib.h
+++ b/src/include/distributed/citus_safe_lib.h
@@ -26,7 +26,7 @@ extern void SafeQsort(void *ptr, rsize_t count, rsize_t size,
 void * SafeBsearch(const void *key, const void *ptr, rsize_t count, rsize_t size,
 				   int (*comp)(const void *, const void *));
 int SafeSnprintf(char *str, rsize_t count, const char *fmt, ...) pg_attribute_printf(3,
-																					 0);
+																					 4);
 
 #define memset_struct_0(variable) memset(&variable, 0, sizeof(variable))