A few more Reciever tweaks