A few changes to the delay send/receive stuffs.