Minor updates/fix to --cbqi-recurse