Fixed some CS issues