Try to fix upgrading from old versions.