Fixing CS checks