Bug fixes concerning how traces are split