Some Priam fixes related to restore