fixup package issues