Fix up the package