Fix CS issues