more cs fixes