Almost get live export working again