BBB-98, BBB-99: Patch after a second round of tests