some restore fixes