Fixed email and export issues