KAA-177: Make fixes according to pull request comments.