Fix recovery compatible issues

Change-Id: I8ed60c8bc765692e6c4f38b66248ddcf6dd8db91