Dear Sasha,
I fixed the two files accordingly to your comments in the previous merge request.
Best, Fra