Fix some CS issues