More AVGNA fixes