fix cba/wbc defects