Fix remaining old email occurrences