Fix CM7 building