issue-7: minor fixes