Fixing critical rules violations