Fix imports and exports