Fixing issues with importing/exporting to non-CWD bundles