[pmc] Fixed WB Bugs