Fix make errors for the CCS changes