Fixing some CS issues