Fixed a timing bug in one-shot email sender.
Fixed a few bugs with 1.8 integration.