Fixed audit violations