More robust install process around CLT