Fixed traces, but the new Run is slow. Probably fixable