More cs fixes