Changes to how receives are handled

Slight changes to how receive is handled.