Fixup dependencies