Cs fixes

:+1: