OSNG-62 - resolved some violations