Address CLM violations