diff --git a/buildbot/masters/datatracker/master.cfg b/buildbot/masters/datatracker/master.cfg
index ddab34261..124774384 100644
--- a/buildbot/masters/datatracker/master.cfg
+++ b/buildbot/masters/datatracker/master.cfg
@@ -1,5 +1,6 @@
 # -*- python -*-
 # ex: set syntax=python:
+import re
 from buildbot_passwords import *
 
 
@@ -98,9 +99,9 @@ class UnitTest(WarningCountingShellCommand):
         "skipped":          "(?:OK|FAILED).*\skipped=(\d+)",
         "failed":           "FAILED.*failures\=(\d+)",
         "errors":           "FAILED.*errors\=(\d+)",
-        "template_coverage":" *Template coverage: +([0-9.]+%)",
-        "url_coverage":     " *Url coverage: +([0-9.]+%)",
-        "code_coverage":    " *Code coverage: +([0-9.]+%)",
+        "template_coverage":" +Template coverage: +([0-9.]+%)",
+        "url_coverage":     " +Url coverage: +([0-9.]+%)",
+        "code_coverage":    " +Code coverage: +([0-9.]+%)",
     }
 
     def setTestResults(self, **kwargs):
@@ -139,12 +140,13 @@ class UnitTest(WarningCountingShellCommand):
             description = description[:]  # make a private copy
             for name in self.step_status.statistics:
                 value = self.step_status.getStatistic(name)
+                displayName = name.replace('_', ' ').capitalize()
                 if   type(value) is float: # this is run-time
-                    description.append('%.2fs %s' % (value, name))
+                    description.append('%.2fs %s' % (value, displayName))
                 elif type(value) is int:
-                    description.append('%d %s' % (value, name))
+                    description.append('%d %s' % (value, displayName))
                 else:
-                    description.append('%s %s' % (value, name))
+                    description.append('%s %s' % (value, displayName))
         return description
     
 
@@ -162,7 +164,6 @@ factory.addStep(SVN(
                 repourl=Interpolate('https://svn.tools.ietf.org/svn/tools/ietfdb/%(src::branch:~trunk)s'),
                 descriptionSuffix=[Interpolate('%(src::branch)s %(src::revision)s')],
             ))
-factory.addStep(RemovePYCs(workdir=Interpolate('build/%(src::branch)s')))
 factory.addStep(ShellCommand(
                 descriptionDone="install requirements",
                 workdir=Interpolate('build/%(src::branch)s'),