caf : Some building changes