Fix remaining CS issues