Fixes to use import intents without file data