Fixed some package cycles