Exercise data export fixes