First round of CS fixes