Fixing up the export command a bit