CLEANUP: CS fixes