Fixes for recovery variant

Change-Id: I3e58b09bd7817e04c202295130ddfcd3a886747c