Make it build with non caf repos