Cs fixes

Sure, but what's the reason?