Fixed some issues with the holy war CBs