Fixed bugs emailed from heather