ANA-502 review fixes