Automated CS fixes