Fixed some package stuff