More fixes to the execution trace.