Some fixes done to recover from Worker and Receiver failures