A few small fixes, sending work won't block indefinitely due to buffering.