more tweaking of package handling