CS fixes part 1