recovery: fix compile breakage and make compatible with other recoveries.