Fix previous errors
More scala patternishy in TraceFilter