diff --git a/lib/tsan/rtl/tsan_report.cc b/lib/tsan/rtl/tsan_report.cc
index 7fc2e16..955e62d 100644
--- a/lib/tsan/rtl/tsan_report.cc
+++ b/lib/tsan/rtl/tsan_report.cc
@@ -137,6 +137,7 @@
     TsanPrintf("  %s()\n      %s:%d +0x%zx\n",
         ent->func, ent->file, ent->line, (void*)ent->offset);
   }
+  TsanPrintf("\n");
 }
 
 static void PrintMop(const ReportMop *mop, bool first) {
@@ -157,7 +158,7 @@
 
 void PrintReport(const ReportDesc *rep) {
   TsanPrintf("==================\n");
-  TsanPrintf("WARNING: DATA RACE at %p\n", (void*)rep->mops[0]->addr);
+  TsanPrintf("WARNING: DATA RACE\n");
   for (uptr i = 0; i < rep->mops.Size(); i++)
     PrintMop(rep->mops[i], i == 0);
   for (uptr i = 0; i < rep->threads.Size(); i++)
diff --git a/lib/tsan/rtl/tsan_rtl.cc b/lib/tsan/rtl/tsan_rtl.cc
index a19d9eb..2263a66 100644
--- a/lib/tsan/rtl/tsan_rtl.cc
+++ b/lib/tsan/rtl/tsan_rtl.cc
@@ -164,7 +164,9 @@
     return;
   is_initialized = true;
   ScopedInRtl in_rtl;
+#ifndef TSAN_GO
   InitializeAllocator();
+#endif
   InitializeInterceptors();
   const char *env = InitializePlatform();
   InitializeMutex();
diff --git a/lib/tsan/rtl/tsan_rtl_thread.cc b/lib/tsan/rtl/tsan_rtl_thread.cc
index 0546449..4de0c1d 100644
--- a/lib/tsan/rtl/tsan_rtl_thread.cc
+++ b/lib/tsan/rtl/tsan_rtl_thread.cc
@@ -238,7 +238,9 @@
   }
   tctx->epoch1 = thr->fast_state.epoch();
 
+#ifndef TSAN_GO
   AlloctorThreadFinish(thr);
+#endif
   thr->~ThreadState();
   StatAggregate(ctx->stat, thr->stat);
   tctx->thr = 0;