Import/Export Workspace Fixes