Add more fixes for crashing on random channels