Fixes for email duplication.