Small bug fixes to AthenaExportMt