Fix up dependencies - still needs repacking