Cs fixes (8/42)

Cs fixes