script packaging fixes