Fixed compilation issues under CCS