more adv comp fixes