Fix CS to respect PSRs