more package fixes