Some cs fixes