Further small fixes on import controller and model