More parallel fixes