minor concurrency and task tree fixes