Second round of CS fixes