Some CS issues fixed