Some violations fixed