Make e-mail invites more robust.
Improve keepalive handling, which has been producing lots of errors of late.