Fix all CB instructions