ANA-513: review fixes