recovery: fixes for the way cm infects the config