Fixing CS violations