Fixes some problems after port from IG2

The new repository export/import-feature did not successfully get ported to IG3. Here are some fixes that fixes the new features.