Building/Retinue fixes