CS fixes
More changes