ANA-513: review fixes #1