Some fixes #1

Closed vladyslav-vasiliev closed 6 years ago