backup and restore improvements