CS fixes

Done.