fix some packagging issues