diff --git a/radio/src/debug.cpp b/radio/src/debug.cpp
index dc5969de0..8c2bc2a12 100644
--- a/radio/src/debug.cpp
+++ b/radio/src/debug.cpp
@@ -82,13 +82,13 @@ const struct TraceElement * getTraceElement(uint16_t idx)
 
 void dumpTraceBuffer()
 {
-  TRACE("Dump of Trace Buffer (" VERSION " " DATE " " TIME "):");
+  TRACE("Dump of Trace Buffer (%s " DATE " " TIME "):", vers_stamp);
   TRACE("#   Time                     Event  Data");
   for(int n = 0; n < TRACE_BUFFER_LEN; ++n) {
     struct gtm tp;
     filltm(&traceBuffer[n].time, &tp);
-    TRACE_INFO_WP("%02d  ", n);
-    TRACE_INFO_WP("%4d-%02d-%02d,%02d:%02d:%02d.%02d0", tp.tm_year+1900, tp.tm_mon+1, tp.tm_mday, tp.tm_hour, tp.tm_min, tp.tm_sec, traceBuffer[n].time_ms);
+    TRACE_NOCRLF("%02d  ", n);
+    TRACE_NOCRLF("%4d-%02d-%02d,%02d:%02d:%02d.%02d0", tp.tm_year+1900, tp.tm_mon+1, tp.tm_mday, tp.tm_hour, tp.tm_min, tp.tm_sec, traceBuffer[n].time_ms);
     TRACE("  %03d    0x%08x", traceBuffer[n].event, traceBuffer[n].data);
     if (traceBuffer[n].time == 0 && traceBuffer[n].time_ms == 0) break;
 #if !defined(SIMU)
diff --git a/radio/src/gui/212x64/view_statistics.cpp b/radio/src/gui/212x64/view_statistics.cpp
index de5eb944b..8f2cdbcd8 100644
--- a/radio/src/gui/212x64/view_statistics.cpp
+++ b/radio/src/gui/212x64/view_statistics.cpp
@@ -190,8 +190,6 @@ void menuStatisticsDebug(event_t event)
 
 
 #if defined(DEBUG_TRACE_BUFFER)
-#include "stamp-opentx.h"
-
 void menuTraceBuffer(event_t event)
 {
   switch(event)
@@ -202,11 +200,9 @@ void menuTraceBuffer(event_t event)
       break;
   }
 
-  SIMPLE_SUBMENU("Trace Buffer " VERSION, TRACE_BUFFER_LEN);
+  SIMPLE_SUBMENU("Trace Buffer", TRACE_BUFFER_LEN);
   /* RTC time */
-  struct gtm t;
-  gettime(&t);
-  putsTime(LCD_W+1, 0, t, TIMEBLINK);
+  drawRtcTime(LCD_W+1, 0, LEFT|TIMEBLINK);
 
   uint8_t y = 0;
   uint8_t k = 0;