client packaging fixes