Add recover provider options.
Minor fixes.