Fixing exporting to non-CWD bundles