Bug fixes for AthenaExportMt