acclaim: recovery fixes

Change-Id: I1a4c00f4073d7334b322e4d3fd697d944fe109a8