Fix a couple bugs related to clusters and emailing