am 52eeea4f: minor recovery fixes

* commit '52eeea4fa59c15ecb09c32b8e05653f4e55f5188':
  minor recovery fixes