Fixed some package issues