receiver fixes