[1033] fixed various violations