Fixes that were causing issues in import config.xml