fixes for adv mode