First round of patches to BD