Massive CS fixes