CS fixes part 2