Backup: Fixed some bugs with import/export