Small improvements to Receiver