Fix imports and dependencies