ANA-516: review fixes