More concurrent bug fixes