Fixed fabricating claims

Fixed fabricating claims not being possible in some cases where it
should, as well as some CBs not being usable