Vaxia fixes on feedback rnd 2