Fixes in the comms receive routines