fix imports and dependencies