Fixes for email since queue isn't working.