Fixed more violations