Fixed package bugs