Package fixup