Fix up package restore.