Several small changes regarding recovery