Fixed some violations