Receiver fixes