Fix bugs with restored items