Fixes for AVGNA