Adjust to Calo's build set-up