FABRIC-583: additional concurrency fixes