Some tweaks for import controller