Small mail fixes