cs fixes