Fixed CS violations and hints