Fix diagnostics to be per thread