Fixed imports in target creation