some more violations fixed