ANA-585: review fixes