ANA-570: review fixes