Improved sending handling. Get Queueing to work again.