Fixes for parallelism