Small fixes to sendgrid sender