Fix CS violations