TIQR-225: Minor fixes #11

Closed dima-ko closed 2 years ago