Fixes on followup emails