Fixing CS issues