Fix more CS issues