Small bug fixes with the package script