Cs fixes

I'm not completely convinced, but I will make the changes