Fixup some packages