Fix some CS issues caused by last merges