Fixes for death wakers and bullies
Add buffers to channels to prevent blocking