Fix generated imports
Fix imports