packages fixup