Fix BCC and BVS implemention