Fix generated imports (via @mattoddie)
Fix imports