Fix imports in order to fix build problems with network package