CS fixes and reverting changes