Fixed some parallelism problems