Watch files on restore
Fix destructor renaming