diff --git a/src/jrd/trace/TraceCmdLine.cpp b/src/jrd/trace/TraceCmdLine.cpp
index b5fee6282ee..92b9a4d1410 100644
--- a/src/jrd/trace/TraceCmdLine.cpp
+++ b/src/jrd/trace/TraceCmdLine.cpp
@@ -66,7 +66,7 @@ namespace
 	struct MessageSet
 	{
 		const int range[2];
-		const std::initializer_list<int> list;
+		const std::initializer_list<USHORT> list;
 
 		void print() const
 		{
diff --git a/src/jrd/trace/TraceObjects.cpp b/src/jrd/trace/TraceObjects.cpp
index 6b7ed937c5f..6c74e837433 100644
--- a/src/jrd/trace/TraceObjects.cpp
+++ b/src/jrd/trace/TraceObjects.cpp
@@ -684,7 +684,7 @@ TraceRuntimeStats::TraceRuntimeStats(Attachment* attachment,
 		m_info.pin_tables = m_legacyCounts.begin();
 		m_info.pin_count = m_legacyCounts.getCount();
 
-		for (MetaId i = 0; i < m_info.pin_count; i++)
+		for (FB_SIZE_T i = 0; i < m_info.pin_count; i++)
 		{
 			m_info.pin_tables[i].trc_relation_id = m_tableCounters.getObjectId(i);
 			m_info.pin_tables[i].trc_relation_name = m_tableCounters.getObjectName(i);