ANA-475: review fixes