Kaa-277: fix review comments