[Insight21] Fixed violations