Fixing SC violations