Fixes for email sends not working in prod