Fixing CS errors