ANA-574: review fixes