Fixes to sendgrid support after bumping the dep