Automated cs checks fixes