Fixing retinue bugs