Bug 16141 workaround and set better parallel configs