Fixed some export issues
Merge branch 'Export'