Fixing importing/exporting to non-CWD bundles