Minor fixes and new simple algorithm to disable damaged channels