more packaging fixes