Fix package bugs