Client package fixes