CBV support, fixing adv_import return