Fixed package problems