Retinue fixes