CS fixes

I will do it this evening