Fixup dependencies noe that 8974 is available in *-caf