Small Cs fixes