Add m8 changes to recovery