A couple of performance improvements for the XTrace server