Initial fixes for parallelism